Merge pull request ceph#65694 from mohit84/mclock_scheduler_monc

osd: Remove monc reference from scheduler

Reviewed-by: Sridhar Seshasayee <[email protected]>
Reviewed-by: Matan Breizman <[email protected]>

Author: ljflores

src/osd/OSD.cc

@@ -11030,7 +11030,7 @@ OSDShard::OSDShard(
     shard_lock{make_mutex(shard_lock_name)},
     scheduler(ceph::osd::scheduler::make_scheduler(
       cct, osd->whoami, osd->num_shards, id, osd->store->is_rotational(),
-      osd->store->get_type(), osd_op_queue, osd_op_queue_cut_off, osd->monc)),
+      osd->store->get_type(), osd_op_queue, osd_op_queue_cut_off)),
     context_queue(sdata_wait_lock, sdata_cond),
     ec_extent_cache_lru(cct->_conf.get_val<uint64_t>(
       "ec_extent_cache_size"))

src/osd/scheduler/OpScheduler.cc

@@ -25,7 +25,7 @@ namespace ceph::osd::scheduler {
 OpSchedulerRef make_scheduler(
   CephContext *cct, int whoami, uint32_t num_shards, int shard_id,
   bool is_rotational, std::string_view osd_objectstore,
-  op_queue_type_t osd_scheduler, unsigned op_queue_cut_off, MonClient *monc)
+  op_queue_type_t osd_scheduler, unsigned op_queue_cut_off)
 {
   // Force the use of 'wpq' scheduler for filestore OSDs.
   // The 'mclock_scheduler' is not supported for filestore OSDs.
@@ -42,7 +42,7 @@ OpSchedulerRef make_scheduler(
     // default is 'mclock_scheduler'
     return std::make_unique<
       mClockScheduler>(cct, whoami, num_shards, shard_id, is_rotational,
-        op_queue_cut_off, monc);
+        op_queue_cut_off);
   } else {
     ceph_abort_msg("Invalid choice of wq");
   }

src/osd/scheduler/OpScheduler.h

@@ -73,7 +73,7 @@ using OpSchedulerRef = std::unique_ptr<OpScheduler>;
 OpSchedulerRef make_scheduler(
   CephContext *cct, int whoami, uint32_t num_shards, int shard_id,
   bool is_rotational, std::string_view osd_objectstore,
-  op_queue_type_t osd_scheduler, unsigned op_queue_cut_off, MonClient *monc);
+  op_queue_type_t osd_scheduler, unsigned op_queue_cut_off);
 
 /**
  * Implements OpScheduler in terms of OpQueue