fix removing is_active node after re-creation

ClickHouse · Mar 8, 2024 · e231747 · e231747
1 parent d93dd98
commit e231747
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -75,6 +75,8 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
     String active_path = fs::path(database->replica_path) / "active";
     String active_id = toString(ServerUUID::get());
     zookeeper->deleteEphemeralNodeIfContentMatches(active_path, active_id);
+    if (active_node_holder)
+        active_node_holder->setAlreadyRemoved();
     zookeeper->create(active_path, active_id, zkutil::CreateMode::Ephemeral);
     active_node_holder.reset();
     active_node_holder_zookeeper = zookeeper;

diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
@@ -1141,6 +1141,8 @@ def test_sync_replica(started_cluster):
 
     dummy_node.query("SYSTEM SYNC DATABASE REPLICA test_sync_database")
 
+    assert "2\n" == main_node.query("SELECT sum(is_active) FROM system.clusters WHERE cluster='test_sync_database'")
+
     assert dummy_node.query(
         "SELECT count() FROM system.tables where database='test_sync_database'"
     ).strip() == str(number_of_tables)