Enable keep_free_space_bytes for metadata storage

MikhailBurdukov · May 20, 2024 · 04f78b5 · 04f78b5
1 parent 6f74beb
commit 04f78b5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Disks/ObjectStorages/MetadataStorageFactory.cpp b/src/Disks/ObjectStorages/MetadataStorageFactory.cpp
@@ -99,8 +99,10 @@ void registerMetadataStorageFromDisk(MetadataStorageFactory & factory)
     {
         auto metadata_path = config.getString(config_prefix + ".metadata_path",
                                               fs::path(Context::getGlobalContextInstance()->getPath()) / "disks" / name / "");
+        auto metadata_keep_free_space_bytes = config.getUInt64(config_prefix + ".metadata_keep_free_space_bytes", 0);
+
         fs::create_directories(metadata_path);
-        auto metadata_disk = std::make_shared<DiskLocal>(name + "-metadata", metadata_path, 0, config, config_prefix);
+        auto metadata_disk = std::make_shared<DiskLocal>(name + "-metadata", metadata_path, metadata_keep_free_space_bytes, config, config_prefix);
         auto key_compatibility_prefix = getObjectKeyCompatiblePrefix(*object_storage, config, config_prefix);
         return std::make_shared<MetadataStorageFromDisk>(metadata_disk, key_compatibility_prefix);
     });

diff --git a/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql b/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql
@@ -30,6 +30,28 @@ settings disk=disk(name='test2',
 drop table test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk=disk(name='test3',
+                   type = object_storage,
+                   object_storage_type = s3,
+                   metadata_storage_type = local,
+                   metadata_keep_free_space_bytes = 1024,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse);
+drop table test;
+
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test4',
+                   type = object_storage,
+                   object_storage_type = s3,
+                   metadata_storage_type = local,
+                   metadata_keep_free_space_bytes = 0,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse);
+drop table test;
+
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test5',
                    type = object_storage,
                    object_storage_type = s3,
                    metadata_type = lll,
@@ -38,7 +60,7 @@ settings disk=disk(name='test3',
                    secret_access_key = clickhouse); -- { serverError UNKNOWN_ELEMENT_IN_CONFIG }
 
 create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='test4',
+settings disk=disk(name='test6',
                    type = object_storage,
                    object_storage_type = kkk,
                    metadata_type = local,
@@ -47,7 +69,7 @@ settings disk=disk(name='test4',
                    secret_access_key = clickhouse); -- { serverError UNKNOWN_ELEMENT_IN_CONFIG }
 
 create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='test5',
+settings disk=disk(name='test7',
                    type = kkk,
                    object_storage_type = s3,
                    metadata_type = local,