GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-17 04:40:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): eliminate NEU_REQ_ADD_DRIVERS request data race

Browse Source
This commit is contained in:
eeff
2024-03-08 11:27:59 +08:00
parent 53ff65ca4b
commit 7390d24fab
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager_internal.c
+11
View File
@@ -460,6 +460,7 @@ static inline int add_driver(neu_manager_t *manager, neu_req_driver_t *driver)
if (0 != neu_adapter_validate_gtags(adapter, &cmd, &resp) ||
0 != neu_adapter_try_add_gtags(adapter, &cmd, &resp) ||
0 != neu_adapter_add_gtags(adapter, &cmd, &resp)) {
neu_adapter_uninit(adapter);
neu_manager_del_node(manager, driver->node);
}
@@ -498,11 +499,21 @@ int neu_manager_add_drivers(neu_manager_t *manager, neu_req_driver_array_t *req)
for (uint16_t i = 0; i < req->n_driver; ++i) {
ret = add_driver(manager, &req->drivers[i]);
if (0 != ret) {
nlog_notice("add i:%" PRIu16 " driver:%s fail", i,
req->drivers[i].node);
while (i-- > 0) {
nlog_notice("rollback i:%" PRIu16 " driver:%s", i,
req->drivers[i].node);
neu_adapter_t *adapter = neu_node_manager_find(
manager->node_manager, req->drivers[i].node);
neu_adapter_uninit(adapter);
neu_manager_del_node(manager, req->drivers[i].node);
}
nlog_error("fail to add %" PRIu16 " drivers", req->n_driver);
break;
}
nlog_notice("add i:%" PRIu16 " driver:%s success", i,
req->drivers[i].node);
}
return ret;