fix

ClickHouse · Mar 20, 2024 · f44127c · f44127c
1 parent 02d5c46
commit f44127c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -77,10 +77,7 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
     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;
-    active_node_holder = zkutil::EphemeralNodeHolder::existing(active_path, *active_node_holder_zookeeper);
 
     String log_ptr_str = zookeeper->get(database->replica_path + "/log_ptr");
     UInt32 our_log_ptr = parse<UInt32>(log_ptr_str);
@@ -129,9 +126,15 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
         initializeLogPointer(log_entry_name);
     }
 
-    std::lock_guard lock{database->metadata_mutex};
-    if (!database->checkDigestValid(context, false))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent database metadata after reconnection to ZooKeeper");
+    {
+        std::lock_guard lock{database->metadata_mutex};
+        if (!database->checkDigestValid(context, false))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent database metadata after reconnection to ZooKeeper");
+    }
+
+    zookeeper->create(active_path, active_id, zkutil::CreateMode::Ephemeral);
+    active_node_holder_zookeeper = zookeeper;
+    active_node_holder = zkutil::EphemeralNodeHolder::existing(active_path, *active_node_holder_zookeeper);
 }
 
 String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)