From ac73d1fbac45bd53293dbc3b37f2b04e1d885dcc Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Thu, 11 May 2023 14:18:46 +0000 Subject: [PATCH] crimson/osd/scheduler/mclock_scheduler: Fix OSD unable to start https://github.com/ceph/ceph/pull/49975 Introduced changes to mclock conf value types which caused the osd to stall while booting. Signed-off-by: Matan Breizman (cherry picked from commit 5cb12bb4af1f1c9cd3051429d8f6c0c01535ab04) --- src/crimson/osd/scheduler/mclock_scheduler.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/osd/scheduler/mclock_scheduler.cc b/src/crimson/osd/scheduler/mclock_scheduler.cc index 195ea8dd8a1..006e4816cd7 100644 --- a/src/crimson/osd/scheduler/mclock_scheduler.cc +++ b/src/crimson/osd/scheduler/mclock_scheduler.cc @@ -45,21 +45,21 @@ mClockScheduler::mClockScheduler(ConfigProxy &conf) : void mClockScheduler::ClientRegistry::update_from_config(const ConfigProxy &conf) { default_external_client_info.update( - conf.get_val("osd_mclock_scheduler_client_res"), + conf.get_val("osd_mclock_scheduler_client_res"), conf.get_val("osd_mclock_scheduler_client_wgt"), - conf.get_val("osd_mclock_scheduler_client_lim")); + conf.get_val("osd_mclock_scheduler_client_lim")); internal_client_infos[ static_cast(scheduler_class_t::background_recovery)].update( - conf.get_val("osd_mclock_scheduler_background_recovery_res"), + conf.get_val("osd_mclock_scheduler_background_recovery_res"), conf.get_val("osd_mclock_scheduler_background_recovery_wgt"), - conf.get_val("osd_mclock_scheduler_background_recovery_lim")); + conf.get_val("osd_mclock_scheduler_background_recovery_lim")); internal_client_infos[ static_cast(scheduler_class_t::background_best_effort)].update( - conf.get_val("osd_mclock_scheduler_background_best_effort_res"), + conf.get_val("osd_mclock_scheduler_background_best_effort_res"), conf.get_val("osd_mclock_scheduler_background_best_effort_wgt"), - conf.get_val("osd_mclock_scheduler_background_best_effort_lim")); + conf.get_val("osd_mclock_scheduler_background_best_effort_lim")); } const dmc::ClientInfo *mClockScheduler::ClientRegistry::get_external_client( -- 2.39.5