Skip to content

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

refactor of delta config

上级 56bc22d2
显示空白字符变更
内嵌 并排
正在显示 包含 142 行增加 和 87 行删除
opencv-motion-detect/evcloudsvc.cpp
浏览文件 @ 6c24a369
...@@ -124,108 +124,111 @@ private: ...@@ -124,108 +124,111 @@ private:
else { else {
json &data = newConfig["data"]; json &data = newConfig["data"];
// for clusters
for(auto &[k, v]: data.items()) { for(auto &[k, v]: data.items()) {
// TODO: confirm overwrite, take snapshot // TODO: confirm overwrite, take snapshot
if(this->configMap.count(k) != 0) { if(this->configMap.count(k) != 0) {
spdlog::warn("evcloudsvc TODO: key {} already exist, take snapshot for safety", k); spdlog::warn("evcloudsvc TODO: key {} already exist, take snapshot for safety", k);
}else{
spdlog::info("evcloudsvc new config for cluster {}", k);
} }
// this is one evmgr // else {
if(v.count("sn") == 0||v["sn"] != k) { // // calc diff
ret["code"] = 2;
string msg = fmt::format("evcloudsvc invalid value for cluster mgr with sn {} but key: {}", k, string(v["sn"]));
ret["msg"] = msg;
spdlog::error(msg);
break;
}
else {
// find all modules
if(v.count("ipcs") == 0||v["ipcs"].size() == 0) {
spdlog::error("invalid ipcs in config body");
ret["code"] = 3;
break;
}
else {
json &ipcs = v["ipcs"];
for(auto &ipc : ipcs) {
if(ipc.count("modules") == 0||ipc["modules"].size() == 0) {
spdlog::error("invalid modules in ipcs config body");
ret["code"] = 4;
break;
}
else {
json &modules = ipc["modules"];
for(auto &[mn, ma]: modules.items()) {
for(auto &m:ma) {
if(m.count("sn") != 0 && m["sn"].size() != 0) {
string modKey;
string sn = m["sn"];
//ml
if(mn == "evml" && m.count("type") != 0 && m["type"].size() != 0) {
modKey = sn +":evml:" + m["type"].get<string>();
}
else {
modKey = sn + ":" + mn;
}
// modules // // find all modules
if(this->configMap["sn2mods"].count(sn) == 0) { // if(v.count("ipcs") == 0||v["ipcs"].size() == 0) {
this->configMap["sn2mods"][sn] = json(); // spdlog::error("invalid ipcs in config body");
} // ret["code"] = 3;
// check exist // break;
bool hasModKey =false; // }
for(auto &modKey_:this->configMap["sn2mods"][sn]) { // else {
if(modKey_ == modKey) { // json &ipcs = v["ipcs"];
hasModKey = true; // for(auto &ipc : ipcs) {
break; // if(ipc.count("modules") == 0||ipc["modules"].size() == 0) {
} // spdlog::error("invalid modules in ipcs config body");
} // ret["code"] = 4;
// break;
// }
// else {
// json &modules = ipc["modules"];
// for(auto &[mn, ma]: modules.items()) {
// for(auto &m:ma) {
// if(m.count("sn") != 0 && m["sn"].size() != 0) {
// string modKey;
// string sn = m["sn"];
// //ml
// if(mn == "evml" && m.count("type") != 0 && m["type"].size() != 0) {
// modKey = sn +":evml:" + m["type"].get<string>();
// }
// else {
// modKey = sn + ":" + mn;
// }
if(hasModKey) { // // modules
//nop // if(this->configMap["sn2mods"].count(sn) == 0) {
} // this->configMap["sn2mods"][sn] = json();
else { // }
this->configMap["sn2mods"][sn].push_back(modKey); // // check exist
} // bool hasModKey =false;
// for(auto &modKey_:this->configMap["sn2mods"][sn]) {
// if(modKey_ == modKey) {
// hasModKey = true;
// break;
// }
// }
// modkey -> sn_of_evmgr // if(hasModKey) {
this->configMap["mod2mgr"][modKey] = k; // //nop
} // }
else { // else {
string msg = "evcloudsvc invalid config: " + data.dump();; // this->configMap["sn2mods"][sn].push_back(modKey);
ret["code"] = -1; // }
ret["msg"] = msg;
spdlog::error(msg);
break;
}
}
} // for modules
if(ret["code"] != 0) { // // modkey -> sn_of_evmgr
break; // this->configMap["mod2mgr"][modKey] = k;
} // }
} // for ipc // else {
} // string msg = "evcloudsvc invalid config: " + data.dump();;
} // ret["code"] = -1;
// ret["msg"] = msg;
// spdlog::error(msg);
// break;
// }
// }
// } // for modules
if(ret["code"] != 0) { // if(ret["code"] != 0) {
break; // break;
} // }
} // } // for ipc
// update evmgr config // }
this->configMap[k] = k; // }
//save // if(ret["code"] != 0) {
iret = LVDB::setLocalConfig(v, k); // break;
if(iret < 0) { // }
string msg = "failed to save config " + k + " -> " + v.dump(); // }
spdlog::error(msg); // // update evmgr config
ret["code"] = iret; // this->configMap[k] = k;
ret["msg"] = msg;
// //save
// iret = LVDB::setLocalConfig(v, k);
// if(iret < 0) {
// string msg = "failed to save config " + k + " -> " + v.dump();
// spdlog::error(msg);
// ret["code"] = iret;
// ret["msg"] = msg;
// }
// calc cluster cfg diff
if((this->peerData["config"].count(k) == 0 || this->peerData["config"][k].size() == 0) && v.size() == 0){
spdlog::warn("evcloudsvc ignore empty cluster config for {}", k);
continue;
} }
// update in memory peerData
if(this->peerData["config"].count(k) != 0) { if(this->peerData["config"].count(k) != 0) {
json diff = json::diff(this->peerData["config"][k], v); json diff = json::diff(this->peerData["config"][k], v);
...@@ -417,6 +420,7 @@ private: ...@@ -417,6 +420,7 @@ private:
return ret; return ret;
} }
/// refer to evcloudsvc.yaml
json getConfigForDevice(string sn) json getConfigForDevice(string sn)
{ {
json ret; json ret;
......
opencv-motion-detect/evcloudsvc.yaml 0 → 100644
浏览文件 @ 6c24a369
configmap:
- example: |-
```
{
"NMXH73Y2": "NMXH73Y2",
"code": 0,
"mod2mgr": {
"NMXH73Y2:evml:motion": "NMXH73Y2",
"NMXH73Y2:evpuller": "NMXH73Y2",
"NMXH73Y2:evpusher": "NMXH73Y2",
"NMXH73Y2:evslicer": "NMXH73Y2"
},
"sn2mods": {
"NMXH73Y2": [
"NMXH73Y2:evml:motion",
"NMXH73Y2:evpuller",
"NMXH73Y2:evpusher",
"NMXH73Y2:evslicer"
]
}
}
```
structure:
- mgrSn:
- description:
key: mgrSn
value: mgrSn
- sn2mods:
- description: device with sn that runs mods.
key: sn
value:
- key: sn:modName
value: 1
- mod2mgr:
- description: mod connects to mgr
key: modid
value: mgrSn
api:
- get:
- description: get all cluster configurations that has mod runs on this dev
steps:
- 1: get all models runs on sn
2: for each mod, get mgrSn into set S
3: merge cluster configs of S to data
4: return data for sn
add/update:
- description: add, patch
steps:
- 1: for each cluster config of sn in data
- 2: get diff, update sn2mods & md2mgr, mgrSn and send actions to edge
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论