From: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
Date: Wed, 17 Oct 2018 09:54:20 +0000 (+0800)
Subject: librbd: make the minimum of schedule tick for QoS configurable.
X-Git-Tag: v14.1.0~946^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd613b1c32cd64154a76e88bb094b46ce9baabb5;p=ceph.git

librbd: make the minimum of schedule tick for QoS configurable.

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
---

diff --git a/qa/suites/rbd/thrash/workloads/rbd_fsx_rate_limit.yaml b/qa/suites/rbd/thrash/workloads/rbd_fsx_rate_limit.yaml
index 6d215c62b4b..611320bca15 100644
--- a/qa/suites/rbd/thrash/workloads/rbd_fsx_rate_limit.yaml
+++ b/qa/suites/rbd/thrash/workloads/rbd_fsx_rate_limit.yaml
@@ -8,3 +8,4 @@ overrides:
       client:
         rbd qos iops limit: 50
         rbd qos iops burst: 100
+        rbd qos schedule tick min: 100
diff --git a/src/common/Throttle.cc b/src/common/Throttle.cc
index 015ee09c357..8e026bfdb9f 100644
--- a/src/common/Throttle.cc
+++ b/src/common/Throttle.cc
@@ -764,6 +764,13 @@ int TokenBucketThrottle::set_limit(uint64_t average, uint64_t burst) {
   return 0;
 }
 
+void TokenBucketThrottle::set_schedule_tick_min(uint64_t tick) {
+  std::lock_guard<Mutex> lock(m_lock);
+  if (tick != 0) {
+    m_tick_min = tick;
+  }
+}
+
 uint64_t TokenBucketThrottle::tokens_filled(double tick) {
   return (0 == m_avg) ? 0 : (tick / m_ticks_per_second * m_avg);
 }
diff --git a/src/common/Throttle.h b/src/common/Throttle.h
index d66051c1b43..5e506cdb3e9 100644
--- a/src/common/Throttle.h
+++ b/src/common/Throttle.h
@@ -368,7 +368,7 @@ class TokenBucketThrottle {
   Mutex m_lock;
 
   // minimum of the filling period.
-  static const uint64_t m_tick_min = 50;
+  uint64_t m_tick_min = 50;
   // tokens filling period, its unit is millisecond.
   uint64_t m_tick = 0;
   /**
@@ -446,6 +446,7 @@ public:
   }
   
   int set_limit(uint64_t average, uint64_t burst);
+  void set_schedule_tick_min(uint64_t tick);
 
 private:
   uint64_t tokens_filled(double tick);
diff --git a/src/common/options.cc b/src/common/options.cc
index 7f75b07b719..cf15115663e 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6700,6 +6700,11 @@ static std::vector<Option> get_rbd_options() {
     .set_default(0)
     .set_description("the desired burst limit of write bytes"),
 
+    Option("rbd_qos_schedule_tick_min", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    .set_default(50)
+    .set_min(1)
+    .set_description("minimum schedule tick (in milliseconds) for QoS"),
+
     Option("rbd_discard_on_zeroed_write_same", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description("discard data on zeroed write same instead of writing zero"),
diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index 341f79fab61..c4c17a974ba 100644
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -809,6 +809,9 @@ public:
       sparse_read_threshold_bytes = get_object_size();
     }
 
+    io_work_queue->apply_qos_schedule_tick_min(
+      config.get_val<uint64_t>("rbd_qos_schedule_tick_min"));
+
     io_work_queue->apply_qos_limit(
       RBD_QOS_IOPS_THROTTLE,
       config.get_val<uint64_t>("rbd_qos_iops_limit"),
diff --git a/src/librbd/io/ImageRequestWQ.cc b/src/librbd/io/ImageRequestWQ.cc
index 62f7e779a3a..ee07e10f740 100644
--- a/src/librbd/io/ImageRequestWQ.cc
+++ b/src/librbd/io/ImageRequestWQ.cc
@@ -614,6 +614,13 @@ void ImageRequestWQ<I>::set_require_lock(Direction direction, bool enabled) {
   }
 }
 
+template <typename I>
+void ImageRequestWQ<I>::apply_qos_schedule_tick_min(uint64_t tick){
+  for (auto pair : m_throttles) {
+    pair.second->set_schedule_tick_min(tick);
+  }
+}
+
 template <typename I>
 void ImageRequestWQ<I>::apply_qos_limit(const uint64_t flag,
                                         uint64_t limit,
diff --git a/src/librbd/io/ImageRequestWQ.h b/src/librbd/io/ImageRequestWQ.h
index f1a92d6dfad..5c726985964 100644
--- a/src/librbd/io/ImageRequestWQ.h
+++ b/src/librbd/io/ImageRequestWQ.h
@@ -73,6 +73,8 @@ public:
 
   void set_require_lock(Direction direction, bool enabled);
 
+  void apply_qos_schedule_tick_min(uint64_t tick);
+
   void apply_qos_limit(const uint64_t flag, uint64_t limit, uint64_t burst);
 protected:
   void *_void_dequeue() override;