os/bluetore: configurable sleep period for cleaner

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index 38b95313bc96da7543e08fa23c910532d4534530..dbd31ffc4505d44e962e645244b1980377e6a166 100644 (file)
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -6069,3 +6069,9 @@ options:
   - spdk
   - pmem
   - hm_smr
+- name: bluestore_cleaner_sleep_interval
+  type: float
+  level: advanced
+  desc: How long cleaner should sleep before re-checking utilization
+  default: 5
+  with_legacy: true

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 0b43c65cab0385a25e4c7294a7329300c76bc66f..3c57055b32108a6d2c35937aed40977fc7820c42 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -13102,8 +13102,9 @@ void BlueStore::_zoned_cleaner_thread()
       if (zoned_cleaner_stop) {
        break;
       }
-      dout(20) << __func__ << " sleep" << dendl;
-      zoned_cleaner_cond.wait(l);
+      auto period = ceph::make_timespan(cct->_conf->bluestore_cleaner_sleep_interval);
+      dout(20) << __func__ << " sleep for " << period << dendl;
+      zoned_cleaner_cond.wait_for(l, period);
       dout(20) << __func__ << " wake" << dendl;
     } else {
       l.unlock();