From: Kinga Karczewska <kkarczewska@cloudferro.com>
Date: Thu, 24 Sep 2020 12:10:36 +0000 (+0200)
Subject: common/options: bluestore_volume_selection_policy - introducing fit_to_fast
X-Git-Tag: v16.1.0~193^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fbe53f7d3c42569efdac6ad8473be0fff2db29d;p=ceph.git

common/options: bluestore_volume_selection_policy - introducing fit_to_fast

Signed-off-by: Kinga Karczewska <kkarczewska@cloudferro.com>
Signed-off-by: Kajetan Janiak <kjaniak@cloudferro.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index f89cac95591c..94bcc8b2b417 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4687,11 +4687,11 @@ std::vector<Option> get_global_options() {
 
     Option("bluestore_volume_selection_policy", Option::TYPE_STR, Option::LEVEL_DEV)
     .set_default("use_some_extra")
-    .set_enum_allowed({ "rocksdb_original", "use_some_extra", "without_slow_dir" })
+    .set_enum_allowed({ "rocksdb_original", "use_some_extra", "fit_to_fast" })
     .set_description("Determines bluefs volume selection policy")
     .set_long_description("Determines bluefs volume selection policy. 'use_some_extra' policy allows to override RocksDB level "
                           "granularity and put high level's data to faster device even when the level doesn't completely fit there. "
-                          "'without_slow_dir' policy enables using 100% of faster disk capacity and allows the user to turn on "
+                          "'fit_to_fast' policy enables using 100% of faster disk capacity and allows the user to turn on "
                           "'level_compaction_dynamic_level_bytes' option in RocksDB options."),
 
     Option("bluestore_volume_selection_reserved_factor", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index f97df6f9f699..cb0c78598eba 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5615,7 +5615,7 @@ int BlueStore::_open_bluefs(bool create, bool read_only)
     if (r < 0) {
       return r;
     }
-    if (cct->_conf->bluestore_volume_selection_policy == "without_slow_dir") {
+    if (cct->_conf->bluestore_volume_selection_policy == "fit_to_fast") {
       vselector = new WithoutSlowDirVolumeSelector(
         bluefs->get_block_device_size(BlueFS::BDEV_WAL) * 95 / 100,
         bluefs->get_block_device_size(BlueFS::BDEV_DB) * 95 / 100,
diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 63e6d0f3cf45..f42c6fc9da4f 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -8816,7 +8816,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverFixed3Test) {
 
   SetVal(g_conf(), "bluestore_block_db_create", "true");
   SetVal(g_conf(), "bluestore_block_db_size", "3221225472");
-  SetVal(g_conf(), "bluestore_volume_selection_policy", "without_slow_dir");
+  SetVal(g_conf(), "bluestore_volume_selection_policy", "fit_to_fast");
 
   g_conf().apply_changes(nullptr);