diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp index 6f94e483e20..6d49fde1691 100644 --- a/programs/server/Server.cpp +++ b/programs/server/Server.cpp @@ -1425,7 +1425,7 @@ try const auto interserver_listen_hosts = getInterserverListenHosts(config()); const auto listen_try = getListenTry(config()); - if (config().has("keeper_server")) + if (config().has("keeper_server.server_id")) { #if USE_NURAFT //// If we don't have configured connection probably someone trying to use clickhouse-server instead diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp index 8b719265869..d099b09827c 100644 --- a/src/Common/ZooKeeper/ZooKeeper.cpp +++ b/src/Common/ZooKeeper/ZooKeeper.cpp @@ -1427,7 +1427,7 @@ void validateZooKeeperConfig(const Poco::Util::AbstractConfiguration & config) bool hasZooKeeperConfig(const Poco::Util::AbstractConfiguration & config) { - return config.has("zookeeper") || config.has("keeper") || (config.has("keeper_server") && config.getBool("keeper_server.use_cluster", true)); + return config.has("zookeeper") || config.has("keeper") || (config.has("keeper_server.raft_configuration") && config.getBool("keeper_server.use_cluster", true)); } String getZooKeeperConfigName(const Poco::Util::AbstractConfiguration & config) @@ -1438,7 +1438,7 @@ String getZooKeeperConfigName(const Poco::Util::AbstractConfiguration & config) if (config.has("keeper")) return "keeper"; - if (config.has("keeper_server") && config.getBool("keeper_server.use_cluster", true)) + if (config.has("keeper_server.raft_configuration") && config.getBool("keeper_server.use_cluster", true)) return "keeper_server"; throw DB::Exception(DB::ErrorCodes::NO_ELEMENTS_IN_CONFIG, "There is no Zookeeper configuration in server config"); diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp index 61e08f9fde3..aadedf19204 100644 --- a/src/Coordination/CoordinationSettings.cpp +++ b/src/Coordination/CoordinationSettings.cpp @@ -152,6 +152,9 @@ void KeeperConfigurationAndSettings::dump(WriteBufferFromOwnString & buf) const writeText("raft_limits_reconnect_limit=", buf); write_int(static_cast(coordination_settings->raft_limits_reconnect_limit)); + + writeText("async_replication=", buf); + write_bool(coordination_settings->async_replication); } KeeperConfigurationAndSettingsPtr diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py index c48bd4303c0..708614ed48c 100644 --- a/tests/integration/helpers/cluster.py +++ b/tests/integration/helpers/cluster.py @@ -4260,7 +4260,7 @@ class ClickHouseInstance: if len(self.custom_dictionaries_paths): write_embedded_config("0_common_enable_dictionaries.xml", self.config_d_dir) - # write_embedded_config("0_common_enable_keeper_async_replication.xml", self.config_d_dir) + write_embedded_config("0_common_enable_keeper_async_replication.xml", self.config_d_dir) logging.debug("Generate and write macros file") macros = self.macros.copy()