osd/.../mClockScheduler: remove MonClient argument

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/scheduler/mClockScheduler.h b/src/osd/scheduler/mClockScheduler.h
index 190b5745bb85d27a2f7db5f0e5cb15dde4883a4f..a6a5d2202b201b6cc8e486eeccb545f2554bb6c2 100644 (file)
--- a/src/osd/scheduler/mClockScheduler.h
+++ b/src/osd/scheduler/mClockScheduler.h
@@ -42,7 +42,6 @@ class mClockScheduler : public OpScheduler {
 
   CephContext *cct;
   const unsigned cutoff_priority;
-  MonClient *monc;
 
   ClientRegistry client_registry;
   MclockConfig mclock_conf;
@@ -81,11 +80,9 @@ public:
     std::chrono::duration<Rep,Per> idle_age,
     std::chrono::duration<Rep,Per> erase_age,
     std::chrono::duration<Rep,Per> check_time,
-    MonClient *monc,
     bool init_perfcounter=true)
     : cct(cct),
       cutoff_priority(cutoff_priority),
-      monc(monc),
       mclock_conf(cct, client_registry, num_shards,
                  is_rotational, shard_id, whoami),
       scheduler(
@@ -104,14 +101,13 @@ public:
   mClockScheduler(
     CephContext *cct, int whoami, uint32_t num_shards,
     int shard_id, bool is_rotational, unsigned cutoff_priority,
-    MonClient *monc,
     bool init_perfcounter=true) :
     mClockScheduler(
       cct, whoami, num_shards, shard_id, is_rotational, cutoff_priority,
       crimson::dmclock::standard_idle_age,
       crimson::dmclock::standard_erase_age,
       crimson::dmclock::standard_check_time,
-      monc, init_perfcounter) {}
+      init_perfcounter) {}
 
   /// Calculate scaled cost per item
   uint32_t calc_scaled_cost(int cost);

diff --git a/src/test/osd/TestMClockScheduler.cc b/src/test/osd/TestMClockScheduler.cc
index e283a2b3bd2675cb679d56c84e22bf2589354337..73872be5492898b54948196fa67f072356100817 100644 (file)
--- a/src/test/osd/TestMClockScheduler.cc
+++ b/src/test/osd/TestMClockScheduler.cc
@@ -34,7 +34,6 @@ public:
   int shard_id;
   bool is_rotational;
   unsigned cutoff_priority;
-  MonClient *monc;
   bool init_perfcounter;
   mClockScheduler q;
 
@@ -48,12 +47,11 @@ public:
     shard_id(0),
     is_rotational(false),
     cutoff_priority(12),
-    monc(nullptr),
     init_perfcounter(true),
     q(g_ceph_context, whoami, num_shards, shard_id, is_rotational,
       cutoff_priority,
       2ms, 2ms, 1ms,
-      monc, init_perfcounter),
+      init_perfcounter),
     client1(1001),
     client2(9999),
     client3(100000001)