From f0490e83729be2ddafa52455f0a52a3e32619ffb Mon Sep 17 00:00:00 2001
From: sum12 <sumitjami@gmail.com>
Date: Fri, 30 Aug 2024 12:35:57 +0200
Subject: [PATCH 1/2] catch additional zk connection erros while creating table

and handle the case of dropping empty table dirs
---
 src/Storages/StorageReplicatedMergeTree.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index ff8e362aa36..724dcfcda23 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -544,6 +544,10 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 
         if (!is_first_replica)
             createReplica(metadata_snapshot);
+
+        createNewZooKeeperNodes();
+        syncPinnedPartUUIDs();
+
     }
     catch (...)
     {
@@ -552,9 +556,6 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         throw;
     }
 
-    createNewZooKeeperNodes();
-    syncPinnedPartUUIDs();
-
     if (!has_metadata_in_zookeeper.has_value() || *has_metadata_in_zookeeper)
         createTableSharedID();
 

From d9b1fb7a7cb0813dd12d8f73423662e02a458056 Mon Sep 17 00:00:00 2001
From: sum12 <sumitjami@gmail.com>
Date: Tue, 10 Sep 2024 13:22:29 +0200
Subject: [PATCH 2/2] move more zookeeper related calls in try..catch block

---
 src/Storages/StorageReplicatedMergeTree.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 724dcfcda23..9c650f07a02 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -548,6 +548,10 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         createNewZooKeeperNodes();
         syncPinnedPartUUIDs();
 
+        if (!has_metadata_in_zookeeper.has_value() || *has_metadata_in_zookeeper)
+            createTableSharedID();
+
+
     }
     catch (...)
     {
@@ -556,9 +560,6 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         throw;
     }
 
-    if (!has_metadata_in_zookeeper.has_value() || *has_metadata_in_zookeeper)
-        createTableSharedID();
-
     initialization_done = true;
 }