From: Igor Fedotov <ifedotov@suse.com>
Date: Fri, 30 Aug 2019 13:26:39 +0000 (+0300)
Subject: os/bluestore: introduce bluestore_volume_selection_reserved cfg option.
X-Git-Tag: v14.2.10~148^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cf80e46c90ea233d3fb35b17b6aa8f096f2db86;p=ceph.git

os/bluestore: introduce bluestore_volume_selection_reserved cfg option.

This is an alternative (and straightforward) way to specify barred space not allowed for 'use
some extra' BlueFS volume selector policy.
Disabled by default since it should depend on RocksDB settings and actual volume size.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 185e6a1adb2add91209d5f937c61c309528518f9)
---

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 3723ca6c5d76..367e852abc89 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1091,6 +1091,7 @@ OPTION(bluestore_log_omap_iterator_age, OPT_DOUBLE)
 OPTION(bluestore_log_collection_list_age, OPT_DOUBLE)
 OPTION(bluestore_volume_selection_policy, OPT_STR)
 OPTION(bluestore_volume_selection_reserved_factor, OPT_DOUBLE)
+OPTION(bluestore_volume_selection_reserved, OPT_INT)
 
 OPTION(kstore_max_ops, OPT_U64)
 OPTION(kstore_max_bytes, OPT_U64)
diff --git a/src/common/options.cc b/src/common/options.cc
index 7a4c439fb7e6..a5b9e70e0fb3 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4946,6 +4946,11 @@ std::vector<Option> get_global_options() {
       .set_default(2.0)
       .set_description("DB level size multiplier. Determines amount of space at DB device to bar from the usage when 'use some extra' policy is in action. Reserved size is determined as sum(L_max_size[0], L_max_size[L-1]) + L_max_size[L] * this_factor"),
 
+    Option("bluestore_volume_selection_reserved", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+      .set_flag(Option::FLAG_STARTUP)
+      .set_default(0)
+      .set_description("Space reserved at DB device and not allowed for 'use some extra' policy usage. Overrides 'bluestore_volume_selection_reserved_factor' setting and introduces straightforward limit."),
+
     // -----------------------------------------
     // kstore
 
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index d157bfa41e73..954dffa4531f 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5173,6 +5173,7 @@ int BlueStore::_open_bluefs(bool create)
         rocks_opts.max_bytes_for_level_base,
         rocks_opts.max_bytes_for_level_multiplier,
         reserved_factor,
+        cct->_conf->bluestore_volume_selection_reserved,
         cct->_conf->bluestore_volume_selection_policy != "rocksdb_original");
   }
   if (create) {
diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 83dba638852e..41d7a1bccbd1 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -3434,6 +3434,7 @@ public:
     uint64_t _level_base,
     uint64_t _level_multiplier,
     double reserved_factor,
+    uint64_t reserved,
     bool new_pol)
   {
     l_totals[LEVEL_WAL - LEVEL_FIRST] = _wal_total;
@@ -3445,23 +3446,29 @@ public:
     }
 
     // Calculating how much extra space is available at DB volume.
-    // Which is equal to
-    // DB size - sum_max_level_size(0, L-1) - max_level_size(L) * reserved_factor
-    uint64_t prev_levels = _level0_size;
-    uint64_t cur_level = _level_base;
-    uint64_t cur_threshold = 0;
-    do {
-      uint64_t next_level = cur_level * _level_multiplier;
-      uint64_t next_threshold = prev_levels + cur_level + next_level * reserved_factor;
-      if (_db_total <= next_threshold) {
-        db_avail4slow = cur_threshold ? _db_total - cur_threshold : 0;
-        break;
-      } else {
-        prev_levels += cur_level;
-        cur_level = next_level;
-        cur_threshold = next_threshold;
-      }
-    } while (true);
+    // Depending on the presence of explicit reserved size specification it might be either
+    // * DB volume size - reserved
+    // or
+    // * DB volume size - sum_max_level_size(0, L-1) - max_level_size(L) * reserved_factor
+    if (!reserved) {
+      uint64_t prev_levels = _level0_size;
+      uint64_t cur_level = _level_base;
+      uint64_t cur_threshold = 0;
+      do {
+        uint64_t next_level = cur_level * _level_multiplier;
+        uint64_t next_threshold = prev_levels + cur_level + next_level * reserved_factor;
+        if (_db_total <= next_threshold) {
+          db_avail4slow = cur_threshold ? _db_total - cur_threshold : 0;
+          break;
+        } else {
+          prev_levels += cur_level;
+          cur_level = next_level;
+          cur_threshold = next_threshold;
+        }
+      } while (true);
+    } else {
+      db_avail4slow = _db_total - reserved;
+    }
   }
 
   void* get_hint_by_device(uint8_t dev) const override {