From: Kinga Karczewska <kinga.karczewska67@gmail.com>
Date: Wed, 16 Dec 2020 10:00:39 +0000 (+0100)
Subject: os/bluestore: Introducing FitToFastVolumeSelector
X-Git-Tag: v16.1.0~193^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42ea22251fccb3c54cdc2a6f241de2d29d31e741;p=ceph.git

os/bluestore: Introducing FitToFastVolumeSelector

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

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 084d70992fa9..e40b54591c6f 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -3596,8 +3596,8 @@ void OriginalVolumeSelector::dump(ostream& sout) {
 }
 
 // ===============================================
-// WithoutSlowDirVolumeSelector
+// FitToFastVolumeSelector
 
-void WithoutSlowDirVolumeSelector::get_paths(const std::string& base, paths& res) const {
+void FitToFastVolumeSelector::get_paths(const std::string& base, paths& res) const {
   res.emplace_back(base, 1);  // size of the last db_path has no effect
 }
diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h
index 0f1816dc8520..2443bd7b113c 100644
--- a/src/os/bluestore/BlueFS.h
+++ b/src/os/bluestore/BlueFS.h
@@ -637,9 +637,9 @@ public:
   void dump(std::ostream& sout) override;
 };
 
-class WithoutSlowDirVolumeSelector : public OriginalVolumeSelector {
+class FitToFastVolumeSelector : public OriginalVolumeSelector {
 public:
-  WithoutSlowDirVolumeSelector(
+  FitToFastVolumeSelector(
     uint64_t _wal_total,
     uint64_t _db_total,
     uint64_t _slow_total)
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index cb0c78598eba..27fbb13a978e 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5616,7 +5616,7 @@ int BlueStore::_open_bluefs(bool create, bool read_only)
       return r;
     }
     if (cct->_conf->bluestore_volume_selection_policy == "fit_to_fast") {
-      vselector = new WithoutSlowDirVolumeSelector(
+      vselector = new FitToFastVolumeSelector(
         bluefs->get_block_device_size(BlueFS::BDEV_WAL) * 95 / 100,
         bluefs->get_block_device_size(BlueFS::BDEV_DB) * 95 / 100,
         bluefs->get_block_device_size(BlueFS::BDEV_SLOW) * 95 / 100);