thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-01 03:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build fixes

Browse Source
This commit is contained in:
alesapin 2021-10-19 22:42:40 +03:00
parent 28b96ff20f
commit e530682529
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Coordination/KeeperServer.h
View File

@ -95,12 +95,12 @@ public:
/// Apply action for configuration update. Actually call raft_instance->remove_srv or raft_instance->add_srv. /// Apply action for configuration update. Actually call raft_instance->remove_srv or raft_instance->add_srv.
/// Synchronously check for update results with retries. /// Synchronously check for update results with retries.
void applyConfigurationUpdate(const ConfigUpdateAction & action); void applyConfigurationUpdate(const ConfigUpdateAction & task);
/// Wait configuration update for action. Used by followers. /// Wait configuration update for action. Used by followers.
/// Return true if update was successfully received. /// Return true if update was successfully received.
bool waitConfigurationUpdate(const ConfigUpdateAction & action); bool waitConfigurationUpdate(const ConfigUpdateAction & task);
}; };
} }

2
src/Coordination/KeeperStateMachine.cpp
View File

@ -166,7 +166,7 @@ bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
} }
void KeeperStateMachine::commit_config(const ulong /*log_idx*/, nuraft::ptr<nuraft::cluster_config> & new_conf) void KeeperStateMachine::commit_config(const uint64_t /*log_idx*/, nuraft::ptr<nuraft::cluster_config> & new_conf)
{ {
std::lock_guard lock(cluster_config_lock); std::lock_guard lock(cluster_config_lock);
auto tmp = new_conf->serialize(); auto tmp = new_conf->serialize();

4
src/Coordination/KeeperStateManager.cpp
View File

@ -141,12 +141,12 @@ ConfigUpdateActions KeeperStateManager::getConfigurationDiff(const Poco::Util::A
auto new_configuration_wrapper = parseServersConfiguration(config, true); auto new_configuration_wrapper = parseServersConfiguration(config, true);
std::unordered_map<int, KeeperServerConfigPtr> new_ids, old_ids; std::unordered_map<int, KeeperServerConfigPtr> new_ids, old_ids;
for (auto new_server : new_configuration_wrapper.cluster_config->get_servers()) for (const auto & new_server : new_configuration_wrapper.cluster_config->get_servers())
new_ids[new_server->get_id()] = new_server; new_ids[new_server->get_id()] = new_server;
{ {
std::lock_guard lock(configuration_wrapper_mutex); std::lock_guard lock(configuration_wrapper_mutex);
for (auto old_server : configuration_wrapper.cluster_config->get_servers()) for (const auto & old_server : configuration_wrapper.cluster_config->get_servers())
old_ids[old_server->get_id()] = old_server; old_ids[old_server->get_id()] = old_server;
} }