thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 10:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52804 from ClickHouse/fix-race-keeper-reconfig

Browse Source 
Fix data race in Keeper reconfiguration
This commit is contained in:
Antonio Andelic 2023-07-31 17:56:46 +02:00 committed by GitHub
commit 5d40e7ccb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Coordination/KeeperServer.cpp
View File

@ -794,8 +794,14 @@ bool KeeperServer::applyConfigUpdate(const ClusterUpdateAction & action)
std::lock_guard _{server_write_mutex}; std::lock_guard _{server_write_mutex};
if (const auto * add = std::get_if<AddRaftServer>(&action)) if (const auto * add = std::get_if<AddRaftServer>(&action))
return raft_instance->get_srv_config(add->id) != nullptr {
|| raft_instance->add_srv(static_cast<nuraft::srv_config>(*add))->get_accepted(); if (raft_instance->get_srv_config(add->id) != nullptr)
return true;
auto resp = raft_instance->add_srv(static_cast<nuraft::srv_config>(*add));
resp->get();
return resp->get_accepted();
}
else if (const auto * remove = std::get_if<RemoveRaftServer>(&action)) else if (const auto * remove = std::get_if<RemoveRaftServer>(&action))
{ {
if (remove->id == raft_instance->get_leader()) if (remove->id == raft_instance->get_leader())
@ -807,8 +813,12 @@ bool KeeperServer::applyConfigUpdate(const ClusterUpdateAction & action)
return false; return false;
} }
return raft_instance->get_srv_config(remove->id) == nullptr if (raft_instance->get_srv_config(remove->id) == nullptr)
|| raft_instance->remove_srv(remove->id)->get_accepted(); return true;
auto resp = raft_instance->remove_srv(remove->id);
resp->get();
return resp->get_accepted();
} }
else if (const auto * update = std::get_if<UpdateRaftServerPriority>(&action)) else if (const auto * update = std::get_if<UpdateRaftServerPriority>(&action))
{ {