Merge pull request ClickHouse#79569 from tuanpach/fix-rename-database-atomic

Fix using incorrect paths when renaming an Atomic database

Author: tuanpach

src/Databases/DatabaseAtomic.cpp

@@ -673,8 +673,8 @@ void DatabaseAtomic::renameDatabase(ContextPtr query_context, const String & new
     }
 
     auto new_name_escaped = escapeForFileName(new_name);
-    auto old_database_metadata_path = root_path / "metadata" / (escapeForFileName(getDatabaseName()) + ".sql");
-    auto new_database_metadata_path = root_path / "metadata" / (new_name_escaped + ".sql");
+    auto old_database_metadata_path = fs::path("metadata") / (escapeForFileName(getDatabaseName()) + ".sql");
+    auto new_database_metadata_path = fs::path("metadata") / (new_name_escaped + ".sql");
     db_disk->moveFile(old_database_metadata_path, new_database_metadata_path);
 
     String old_path_to_table_symlinks;

tests/integration/test_database_disk/__init__.py

@@ -0,0 +1,13 @@
+<clickhouse>
+    <database_disk>
+        <disk>custom_db_disk</disk>
+    </database_disk>
+    <storage_configuration>
+        <disks>
+            <custom_db_disk>
+                <type>local</type>
+                <path>/var/lib/clickhouse/disks/default/</path>
+            </custom_db_disk>
+        </disks>
+    </storage_configuration>
+</clickhouse>

tests/integration/test_database_disk/configs/database_disk.xml

@@ -0,0 +1,54 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/database_disk.xml"],
+    with_remote_database_disk=False,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_rename_database_with_database_disk(started_cluster):
+    db_disk_path = node1.query(
+        "SELECT path FROM system.disks WHERE name='custom_db_disk'"
+    ).strip()
+
+    def list_file_in_metadata_dir():
+        return node1.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f'ls "{db_disk_path}/metadata/"',
+            ],
+            privileged=True,
+            user="root",
+        )
+
+    node1.query("DROP DATABASE IF EXISTS test SYNC")
+    node1.query("CREATE DATABASE test ENGINE=Atomic")
+
+    node1.query("RENAME DATABASE test TO test_rename")
+    metadata_files = list_file_in_metadata_dir()
+    assert "test.sql" not in metadata_files
+    assert "test_rename.sql" in metadata_files
+
+    node1.query("RENAME DATABASE test_rename TO test")
+    metadata_files = list_file_in_metadata_dir()
+    assert "test.sql" in metadata_files
+    assert "test_rename.sql" not in metadata_files
+
+    node1.query("DROP DATABASE IF EXISTS test SYNC")