Skip to content

Commit abea096

Browse files
committed
osd/.../mClockScheduler: remove MonClient argument
Signed-off-by: Samuel Just <[email protected]>
1 parent 1f44f38 commit abea096

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/osd/scheduler/mClockScheduler.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class mClockScheduler : public OpScheduler {
4242

4343
CephContext *cct;
4444
const unsigned cutoff_priority;
45-
MonClient *monc;
4645

4746
ClientRegistry client_registry;
4847
MclockConfig mclock_conf;
@@ -81,11 +80,9 @@ class mClockScheduler : public OpScheduler {
8180
std::chrono::duration<Rep,Per> idle_age,
8281
std::chrono::duration<Rep,Per> erase_age,
8382
std::chrono::duration<Rep,Per> check_time,
84-
MonClient *monc,
8583
bool init_perfcounter=true)
8684
: cct(cct),
8785
cutoff_priority(cutoff_priority),
88-
monc(monc),
8986
mclock_conf(cct, client_registry, num_shards,
9087
is_rotational, shard_id, whoami),
9188
scheduler(
@@ -104,14 +101,13 @@ class mClockScheduler : public OpScheduler {
104101
mClockScheduler(
105102
CephContext *cct, int whoami, uint32_t num_shards,
106103
int shard_id, bool is_rotational, unsigned cutoff_priority,
107-
MonClient *monc,
108104
bool init_perfcounter=true) :
109105
mClockScheduler(
110106
cct, whoami, num_shards, shard_id, is_rotational, cutoff_priority,
111107
crimson::dmclock::standard_idle_age,
112108
crimson::dmclock::standard_erase_age,
113109
crimson::dmclock::standard_check_time,
114-
monc, init_perfcounter) {}
110+
init_perfcounter) {}
115111

116112
/// Calculate scaled cost per item
117113
uint32_t calc_scaled_cost(int cost);

src/test/osd/TestMClockScheduler.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class mClockSchedulerTest : public testing::Test {
3434
int shard_id;
3535
bool is_rotational;
3636
unsigned cutoff_priority;
37-
MonClient *monc;
3837
bool init_perfcounter;
3938
mClockScheduler q;
4039

@@ -48,12 +47,11 @@ class mClockSchedulerTest : public testing::Test {
4847
shard_id(0),
4948
is_rotational(false),
5049
cutoff_priority(12),
51-
monc(nullptr),
5250
init_perfcounter(true),
5351
q(g_ceph_context, whoami, num_shards, shard_id, is_rotational,
5452
cutoff_priority,
5553
2ms, 2ms, 1ms,
56-
monc, init_perfcounter),
54+
init_perfcounter),
5755
client1(1001),
5856
client2(9999),
5957
client3(100000001)

0 commit comments

Comments
 (0)