do not remove directory on attach

src/Storages/StorageReplicatedMergeTree.cpp

@@ -234,10 +234,11 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         {
             current_zookeeper = global_context.getZooKeeper();
         }
-        catch (Poco::Exception & e)
+        catch (...)
         {
-            dropIfEmpty();
-            throw e;
+            if (!attach)
+                dropIfEmpty();
+            throw;
         }
     }
 
@@ -262,7 +263,10 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     if (!current_zookeeper)
     {
         if (!attach)
+        {
+            dropIfEmpty();
             throw Exception("Can't create replicated table without ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
+        }
 
         /// Do not activate the replica. It will be readonly.
         LOG_ERROR(log, "No ZooKeeper: table will be in readonly mode.");

tests/integration/test_cleanup_dir_after_bad_zk_conn/test.py

@@ -54,9 +54,20 @@ def test_cleanup_dir_after_wrong_replica_name(start_cluster):
     assert "already exists" in error
     node1.query("CREATE TABLE test_r2 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test2/', 'r2') ORDER BY n")
 
-
 def test_cleanup_dir_after_wrong_zk_path(start_cluster):
     node1.query("CREATE TABLE test3_r1 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test3/', 'r1') ORDER BY n")
     error = node1.query_and_get_error("CREATE TABLE test3_r2 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/', 'r2') ORDER BY n")
     assert "Cannot create" in error
     node1.query("CREATE TABLE test3_r2 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test3/', 'r2') ORDER BY n")
+
+def test_attach_without_zk(start_cluster):
+    node1.query("CREATE TABLE test4_r1 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test4/', 'r1') ORDER BY n")
+    node1.query("DETACH TABLE test4_r1")
+    with PartitionManager() as pm:
+        pm._add_rule({'probability': 0.5, 'source': node1.ip_address, 'destination_port': 2181, 'action': 'DROP'})
+        try:
+            node1.query("ATTACH TABLE test4_r1")
+        except:
+            pass
+    node1.query("ATTACH TABLE IF NOT EXISTS test4_r1")
+    node1.query("SELECT * FROM test4_r1")