Skip to content

E
evsuits
提交 66c132a1 authored 作者: blu's avatar blu
浏览文件
操作

refactor of delta config

上级 1951e662
显示空白字符变更
内嵌 并排
正在显示 包含 78 行增加 和 37 行删除
opencv-motion-detect/evcloudsvc.cpp
浏览文件 @ 66c132a1
...@@ -115,7 +115,7 @@ private: ...@@ -115,7 +115,7 @@ private:
ret["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); ret["time"] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
spdlog::info("evcloudsvc config:{}",newConfig.dump()); spdlog::info("evcloudsvc config:{}",newConfig.dump());
string msg; string msg;
bool bInvalidCfg = false; bool hasError = false;
try { try {
// json deltaCfg = json(); // json deltaCfg = json();
if(newConfig.count("data") == 0|| newConfig["data"].size() == 0) { if(newConfig.count("data") == 0|| newConfig["data"].size() == 0) {
...@@ -128,9 +128,11 @@ private: ...@@ -128,9 +128,11 @@ private:
json &data = newConfig["data"]; json &data = newConfig["data"];
// for edge clusters, those are mgrs // for edge clusters, those are mgrs
for(auto &[k, v]: data.items()) { for(auto &[k, v]: data.items()) {
if(hasError) {
break;
}
if(this->configMap.count(k) != 0 && this->peerData["config"].count(k) != 0) { if(this->configMap.count(k) != 0 && this->peerData["config"].count(k) != 0) {
spdlog::warn("evcloudsvc info: cluster config for {} exists, will do comparison", k); spdlog::warn("evcloudsvc info: cluster config for {} exists, will do comparison", k);
} }
if(this->configMap.count(k) ^ this->peerData["config"].count(k)) { if(this->configMap.count(k) ^ this->peerData["config"].count(k)) {
spdlog::error("evcloudsvc inconsistent configuration for cluster {}", k); spdlog::error("evcloudsvc inconsistent configuration for cluster {}", k);
...@@ -152,19 +154,50 @@ private: ...@@ -152,19 +154,50 @@ private:
json &ipcs = v["ipcs"]; json &ipcs = v["ipcs"];
int ipcIdx = 0; int ipcIdx = 0;
for(auto &ipc : ipcs) { for(auto &ipc : ipcs) {
if(hasError) {
break;
}
if(ipc.count("modules") == 0||ipc["modules"].size() == 0) { if(ipc.count("modules") == 0||ipc["modules"].size() == 0) {
spdlog::warn("evcloudsvc edge cluster {} has no modules for ipc {}", k, ipcIdx); spdlog::warn("evcloudsvc edge cluster {} has no modules for ipc {}", k, ipcIdx);
} }
else { else {
json &modules = ipc["modules"]; json &modules = ipc["modules"];
for(auto &[mn, ma]: modules.items()) { for(auto &[mn, ma]: modules.items()) {
if(hasError) {
break;
}
if(ma.size() == 0) {
spdlog::warn("evcloudsvc /{}/ipcs/{}/modules/{} empty", k, ipcIdx, mn);
continue;
}
int modIdx = 0;
for(auto &m:ma) { for(auto &m:ma) {
if(m.count("sn") != 0 && m["sn"].size() != 0) { if(hasError) {
break;
}
if(m.size() == 0) {
spdlog::warn("evcloudsvc /{}/ipcs/{}/modules/{}/{} empty", k, ipcIdx, mn, modIdx);
continue;
}
if(m.count("sn") == 0 || m["sn"].size() == 0 || m.count("iid") == 0 || m["iid"].size() == 0||(mn == "evml" && (m.count("type") == 0||m["type"].size() == 0))) {
msg = fmt::format("evcloudsvc received invalid config at /{}/ipcs/{}/modules/{}/{}. check for fields sn, iid, type(evml): {}", k, ipcIdx, mn, modIdx, newConfig.dump());
spdlog::error(msg);
break;
}
if (1) {
string msg = "evcloudsvc invalid config: " + data.dump();;
ret["code"] = -1;
ret["msg"] = msg;
spdlog::error(msg);
break;
}
if(2) {
string modKey; string modKey;
string sn = m["sn"]; string sn = m["sn"];
//ml //ml
if(mn == "evml" && m.count("type") != 0 && m["type"].size() != 0) { if(mn == "evml" && m.count("type") != 0 && m["type"].size() != 0) {
modKey = sn +":evml:" + m["type"].get<string>(); modKey = sn +":evml" + m["type"].get<string>();
} }
else { else {
modKey = sn + ":" + mn; modKey = sn + ":" + mn;
...@@ -193,13 +226,6 @@ private: ...@@ -193,13 +226,6 @@ private:
// modkey -> sn_of_evmgr // modkey -> sn_of_evmgr
this->configMap["mod2mgr"][modKey] = k; this->configMap["mod2mgr"][modKey] = k;
} }
else {
string msg = "evcloudsvc invalid config: " + data.dump();;
ret["code"] = -1;
ret["msg"] = msg;
spdlog::error(msg);
break;
}
}// for mod }// for mod
} // for modules } // for modules
} }
......
opencv-motion-detect/evdaemon.cpp
浏览文件 @ 66c132a1
...@@ -187,7 +187,7 @@ private: ...@@ -187,7 +187,7 @@ private:
std::lock_guard<std::mutex> lock(mutSubsystem); std::lock_guard<std::mutex> lock(mutSubsystem);
if(subs.size() != 0) { if(subs.size() != 0) {
for(auto &k: subs) { for(auto &k: subs) {
if((this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0) && this->peerData["config"].count(k) != 0 && this->peerData["enabled"].count(k) != 0 && this->peerData["enabled"][k] != 0){ if((this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0) && this->peerData["config"].count(k) != 0 && this->peerData["enabled"].count(k) != 0 && this->peerData["enabled"][k] != 0) {
pid_t pid; pid_t pid;
ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid); ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid);
if(0 == ret) { if(0 == ret) {
...@@ -198,11 +198,13 @@ private: ...@@ -198,11 +198,13 @@ private:
else { else {
spdlog::info("evdaemon {} failed to create subsystem {}", this->devSn, k); spdlog::info("evdaemon {} failed to create subsystem {}", this->devSn, k);
} }
}else{ }
else {
spdlog::warn("evdaemon {} refuse to start subsystem {}, maybe it's disabled", this->devSn, k); spdlog::warn("evdaemon {} refuse to start subsystem {}, maybe it's disabled", this->devSn, k);
} }
} }
}else{ }
else {
if(this->bColdStart) { if(this->bColdStart) {
vector<string> tmp; vector<string> tmp;
json unkown; json unkown;
...@@ -270,7 +272,8 @@ private: ...@@ -270,7 +272,8 @@ private:
} }
} }
this->bColdStart = false; this->bColdStart = false;
}else{ }
else {
// calc diff // calc diff
auto jret = cfgutils::getModulesOperFromConfDiff(this->oldConfig, this->config, this->deltaCfg, this->devSn); auto jret = cfgutils::getModulesOperFromConfDiff(this->oldConfig, this->config, this->deltaCfg, this->devSn);
this->deltaCfg = json(); this->deltaCfg = json();
...@@ -289,7 +292,8 @@ private: ...@@ -289,7 +292,8 @@ private:
spdlog::info("evdaemon {} startSubSystems config diff to module action: {} -> {}", this->devSn, string(k), int(v)); spdlog::info("evdaemon {} startSubSystems config diff to module action: {} -> {}", this->devSn, string(k), int(v));
if(v == 0) { if(v == 0) {
sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0"); sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0");
}else if(int(v) == 1 || int(v) == 2){ }
else if(int(v) == 1 || int(v) == 2) {
int status = (this->peerData["status"].count(k) == 0) ? -1:this->peerData["status"][k].get<int>(); int status = (this->peerData["status"].count(k) == 0) ? -1:this->peerData["status"][k].get<int>();
spdlog::info("{} status {}", k, status); spdlog::info("{} status {}", k, status);
if(this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0||this->peerData["status"][k] == -1) { if(this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0||this->peerData["status"][k] == -1) {
...@@ -304,11 +308,13 @@ private: ...@@ -304,11 +308,13 @@ private:
else { else {
spdlog::info("evdaemon {} failed to create subsystem {}", this->devSn, k); spdlog::info("evdaemon {} failed to create subsystem {}", this->devSn, k);
} }
}else{ }
else {
// restart // restart
sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v)); sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v));
} }
}else{ }
else {
// //
spdlog::warn("evdaemon {} unkown action {} for module {}", this->devSn, int(v), string(k)); spdlog::warn("evdaemon {} unkown action {} for module {}", this->devSn, int(v), string(k));
} }
...@@ -318,14 +324,16 @@ private: ...@@ -318,14 +324,16 @@ private:
return ret; return ret;
} }
void sendCmd2Peer(string peerId, string cmdVal, string msg) { void sendCmd2Peer(string peerId, string cmdVal, string msg)
{
json meta; json meta;
meta["type"] = EV_MSG_META_TYPE_CMD; meta["type"] = EV_MSG_META_TYPE_CMD;
meta["value"] = cmdVal; meta["value"] = cmdVal;
int ret = z_send(pRouter, peerId, this->daemonId, meta, msg); int ret = z_send(pRouter, peerId, this->daemonId, meta, msg);
if(ret < 0) { if(ret < 0) {
spdlog::error("evdaemon {} failed to send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg); spdlog::error("evdaemon {} failed to send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg);
}else{ }
else {
spdlog::info("evdaemon {} successfully send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg); spdlog::info("evdaemon {} successfully send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg);
} }
} }
......
opencv-motion-detect/evmlmotion.cpp
浏览文件 @ 66c132a1
...@@ -774,8 +774,9 @@ public: ...@@ -774,8 +774,9 @@ public:
init(); init();
thCloudMsgHandler = thread([this]{ thCloudMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDaemon,false); auto body = z_recv_multiple(pDaemon,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
...@@ -787,8 +788,9 @@ public: ...@@ -787,8 +788,9 @@ public:
}); });
thCloudMsgHandler.detach(); thCloudMsgHandler.detach();
thEdgeMsgHandler = thread([this]{ thEdgeMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDealer,false); auto body = z_recv_multiple(pDealer,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
......
opencv-motion-detect/evpuller.cpp
浏览文件 @ 66c132a1
...@@ -371,8 +371,7 @@ protected: ...@@ -371,8 +371,7 @@ protected:
av_packet_unref(&packet); av_packet_unref(&packet);
} }
if(pAVFmtCtxBytes != nullptr) if(pAVFmtCtxBytes != nullptr) {
{
free(pAVFmtCtxBytes); free(pAVFmtCtxBytes);
} }
...@@ -423,8 +422,9 @@ public: ...@@ -423,8 +422,9 @@ public:
} }
init(); init();
thEdgeMsgHandler = thread([this]{ thEdgeMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDealer,false); auto body = z_recv_multiple(pDealer,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
...@@ -442,8 +442,9 @@ public: ...@@ -442,8 +442,9 @@ public:
thEdgeMsgHandler.detach(); thEdgeMsgHandler.detach();
thCloudMsgHandler = thread([this]{ thCloudMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDaemon,false); auto body = z_recv_multiple(pDaemon,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
......
opencv-motion-detect/evpusher.cpp
浏览文件 @ 66c132a1
...@@ -488,8 +488,9 @@ public: ...@@ -488,8 +488,9 @@ public:
init(); init();
thCloudMsgHandler = thread([this]{ thCloudMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDaemon,false); auto body = z_recv_multiple(pDaemon,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
...@@ -501,8 +502,9 @@ public: ...@@ -501,8 +502,9 @@ public:
}); });
thCloudMsgHandler.detach(); thCloudMsgHandler.detach();
thEdgeMsgHandler = thread([this]{ thEdgeMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDealer,false); auto body = z_recv_multiple(pDealer,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
......
opencv-motion-detect/evslicer.cpp
浏览文件 @ 66c132a1
...@@ -582,7 +582,8 @@ protected: ...@@ -582,7 +582,8 @@ protected:
return string(buffer); return string(buffer);
} }
void debugFilesRing(){ void debugFilesRing()
{
spdlog::info("evslicer {} debug files ring. segHead: {}, isFull: {}, max: {}",this->selfId, this->segHead, this->bSegFull, this->numSlices); spdlog::info("evslicer {} debug files ring. segHead: {}, isFull: {}, max: {}",this->selfId, this->segHead, this->bSegFull, this->numSlices);
for(int i = 1; i <= numSlices; i++) { for(int i = 1; i <= numSlices; i++) {
spdlog::info("\tevslicer {} vector[{}] = {}, {}", selfId, i, vTsActive[i], videoFileTs2Name(vTsActive[i])); spdlog::info("\tevslicer {} vector[{}] = {}, {}", selfId, i, vTsActive[i], videoFileTs2Name(vTsActive[i]));
...@@ -875,8 +876,9 @@ public: ...@@ -875,8 +876,9 @@ public:
}); });
thEdgeMsgHandler.detach(); thEdgeMsgHandler.detach();
thCloudMsgHandler = thread([this]{ thCloudMsgHandler = thread([this] {
while(true) { while(true)
{
auto body = z_recv_multiple(pDaemon,false); auto body = z_recv_multiple(pDaemon,false);
if(body.size() == 0) { if(body.size() == 0) {
spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno())); spdlog::error("evslicer {} failed to receive multiple msg: {}", selfId, zmq_strerror(zmq_errno()));
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论