Skip to content

Commit 2cd6c97

Browse files
committed
osd: Remove monc reference from scheduler
The monc reference is already removed from mClockScheduler via this ceph#64978 but it was not removed from the OpScheduler class. Fixes: https://tracker.ceph.com/issues/73279 Signed-off-by: Mohit Agrawal <[email protected]>
1 parent 2c8dc53 commit 2cd6c97

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/osd/OSD.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11034,7 +11034,7 @@ OSDShard::OSDShard(
1103411034
shard_lock{make_mutex(shard_lock_name)},
1103511035
scheduler(ceph::osd::scheduler::make_scheduler(
1103611036
cct, osd->whoami, osd->num_shards, id, osd->store->is_rotational(),
11037-
osd->store->get_type(), osd_op_queue, osd_op_queue_cut_off, osd->monc)),
11037+
osd->store->get_type(), osd_op_queue, osd_op_queue_cut_off)),
1103811038
context_queue(sdata_wait_lock, sdata_cond),
1103911039
ec_extent_cache_lru(cct->_conf.get_val<uint64_t>(
1104011040
"ec_extent_cache_size"))

src/osd/scheduler/OpScheduler.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ceph::osd::scheduler {
2424
OpSchedulerRef make_scheduler(
2525
CephContext *cct, int whoami, uint32_t num_shards, int shard_id,
2626
bool is_rotational, std::string_view osd_objectstore,
27-
op_queue_type_t osd_scheduler, unsigned op_queue_cut_off, MonClient *monc)
27+
op_queue_type_t osd_scheduler, unsigned op_queue_cut_off)
2828
{
2929
// Force the use of 'wpq' scheduler for filestore OSDs.
3030
// The 'mclock_scheduler' is not supported for filestore OSDs.
@@ -41,7 +41,7 @@ OpSchedulerRef make_scheduler(
4141
// default is 'mclock_scheduler'
4242
return std::make_unique<
4343
mClockScheduler>(cct, whoami, num_shards, shard_id, is_rotational,
44-
op_queue_cut_off, monc);
44+
op_queue_cut_off);
4545
} else {
4646
ceph_abort_msg("Invalid choice of wq");
4747
}

src/osd/scheduler/OpScheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ using OpSchedulerRef = std::unique_ptr<OpScheduler>;
7272
OpSchedulerRef make_scheduler(
7373
CephContext *cct, int whoami, uint32_t num_shards, int shard_id,
7474
bool is_rotational, std::string_view osd_objectstore,
75-
op_queue_type_t osd_scheduler, unsigned op_queue_cut_off, MonClient *monc);
75+
op_queue_type_t osd_scheduler, unsigned op_queue_cut_off);
7676

7777
/**
7878
* Implements OpScheduler in terms of OpQueue

0 commit comments

Comments
 (0)