Merge pull request ClickHouse#88256 from ClickHouse/backport/25.8/88153

Backport ClickHouse#88153 to 25.8: Fix redundant host resolution in DDL Worker

Author: clickhouse-gh[bot]

src/Interpreters/DDLWorker.cpp

@@ -1139,6 +1139,7 @@ bool DDLWorker::initializeMainThread()
             auto zookeeper = getAndSetZooKeeper();
             zookeeper->createAncestors(fs::path(queue_dir) / "");
             initializeReplication();
+            markReplicasActive(true);
             initialized = true;
             return true;
         }
@@ -1211,14 +1212,6 @@ void DDLWorker::runMainThread()
             }
 
             cleanup_event->set();
-            try
-            {
-                markReplicasActive(reinitialized);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(log, "An error occurred when markReplicasActive: ");
-            }
             scheduleTasks(reinitialized);
             subsequent_errors_count = 0;
 
@@ -1297,24 +1290,21 @@ void DDLWorker::createReplicaDirs(const ZooKeeperPtr & zookeeper, const NameSet
         zookeeper->createAncestors(fs::path(replicas_dir) / host_id / "");
 }
 
-void DDLWorker::markReplicasActive(bool reinitialized)
+void DDLWorker::markReplicasActive(bool /*reinitialized*/)
 {
     auto zookeeper = getZooKeeper();
 
-    if (reinitialized)
+    // Reset all active_node_holders
+    for (auto & it : active_node_holders)
     {
-        // Reset all active_node_holders
-        for (auto & it : active_node_holders)
-        {
-            auto & active_node_holder = it.second.second;
-            if (active_node_holder)
-                active_node_holder->setAlreadyRemoved();
-            active_node_holder.reset();
-        }
-
-        active_node_holders.clear();
+        auto & active_node_holder = it.second.second;
+        if (active_node_holder)
+            active_node_holder->setAlreadyRemoved();
+        active_node_holder.reset();
     }
 
+    active_node_holders.clear();
+
     for (auto it = active_node_holders.begin(); it != active_node_holders.end();)
     {
         auto & zk = it->second.first;
@@ -1394,7 +1384,12 @@ void DDLWorker::markReplicasActive(bool reinitialized)
         {
             zookeeper->deleteEphemeralNodeIfContentMatches(active_path, active_id);
         }
-        zookeeper->create(active_path, active_id, zkutil::CreateMode::Ephemeral);
+        Coordination::Requests ops;
+        ops.emplace_back(zkutil::makeCreateRequest(active_path, active_id, zkutil::CreateMode::Ephemeral));
+        /// To bump node mtime
+        ops.emplace_back(zkutil::makeSetRequest(fs::path(replicas_dir) / host_id, "", -1));
+        zookeeper->multi(ops);
+
         auto active_node_holder_zookeeper = zookeeper;
         auto active_node_holder = zkutil::EphemeralNodeHolder::existing(active_path, *active_node_holder_zookeeper);
         active_node_holders[host_id] = {active_node_holder_zookeeper, active_node_holder};