Merge PR ceph#29537 into master

* refs/pull/29537/head: os/bluestore/BlueFS: fix device_migrate_to_* to handle varying alloc sizes os/bluestore/BlueFS: apply shared_alloc_size to shared device os/bluestore: whitespace os/bluestore/BlueFS: add bluefs_shared_alloc_size os/bluestore/BlueStore.cc: start should be >= _get_ondisk_reserved() Reviewed-by: Igor Fedotov <[email protected]> Reviewed-by: Josh Durgin <[email protected]> Reviewed-by: Neha Ojha <[email protected]>
byss · Aug 15, 2019 · 2ac53bb · 2ac53bb
2 parents 441ed26 + 9426974
commit 2ac53bb
Show file tree

Hide file tree

Showing 5 changed files with 219 additions and 154 deletions.
diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
@@ -930,6 +930,7 @@ OPTION(bdev_async_discard, OPT_BOOL)
 OPTION(objectstore_blackhole, OPT_BOOL)
 
 OPTION(bluefs_alloc_size, OPT_U64)
+OPTION(bluefs_shared_alloc_size, OPT_U64)
 OPTION(bluefs_max_prefetch, OPT_U64)
 OPTION(bluefs_min_log_runway, OPT_U64)  // alloc when we get this low
 OPTION(bluefs_max_log_runway, OPT_U64)  // alloc this much at a time

diff --git a/src/common/options.cc b/src/common/options.cc
@@ -4281,7 +4281,11 @@ std::vector<Option> get_global_options() {
 
     Option("bluefs_alloc_size", Option::TYPE_SIZE, Option::LEVEL_ADVANCED)
     .set_default(1_M)
-    .set_description(""),
+    .set_description("Allocation unit size for DB and WAL devices"),
+
+    Option("bluefs_shared_alloc_size", Option::TYPE_SIZE, Option::LEVEL_ADVANCED)
+    .set_default(64_K)
+    .set_description("Allocation unit size for primary/shared device"),
 
     Option("bluefs_max_prefetch", Option::TYPE_SIZE, Option::LEVEL_ADVANCED)
     .set_default(1_M)