From 2cd6c97c61796a1f6af7f08c847c141d67d61b70 Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Fri, 26 Sep 2025 18:50:21 +0530 Subject: [PATCH] osd: Remove monc reference from scheduler The monc reference is already removed from mClockScheduler via this #64978 but it was not removed from the OpScheduler class. Fixes: https://tracker.ceph.com/issues/73279 Signed-off-by: Mohit Agrawal --- src/osd/OSD.cc | 2 +- src/osd/scheduler/OpScheduler.cc | 4 ++-- src/osd/scheduler/OpScheduler.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 9c7f1bbadf7..5a269d286e9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -11034,7 +11034,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( "ec_extent_cache_size")) diff --git a/src/osd/scheduler/OpScheduler.cc b/src/osd/scheduler/OpScheduler.cc index efd4dc3303a..eeb358bdaed 100644 --- a/src/osd/scheduler/OpScheduler.cc +++ b/src/osd/scheduler/OpScheduler.cc @@ -24,7 +24,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. @@ -41,7 +41,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"); } diff --git a/src/osd/scheduler/OpScheduler.h b/src/osd/scheduler/OpScheduler.h index 35955c42044..e332335ad00 100644 --- a/src/osd/scheduler/OpScheduler.h +++ b/src/osd/scheduler/OpScheduler.h @@ -72,7 +72,7 @@ using OpSchedulerRef = std::unique_ptr; 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 -- 2.39.5