From 1d9aa2305fc57cea3d09cec2abe825b262ae1baa Mon Sep 17 00:00:00 2001 From: NitzanMordhai Date: Thu, 20 Oct 2022 06:29:30 +0000 Subject: [PATCH] OSD: Remove shard lock that mClockScheduler use when updating conf When mClockScheduler uses bench to determine conf. values a deadlock can occur if the update scheduler config run during consume_map already started. Fixes: https://tracker.ceph.com/issues/57699 Signed-off-by: Nitzan Mordechai (cherry picked from commit 6450dae40120b0e3d9e46b4561b8212ef330470a) --- src/osd/OSD.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 8d9501354276..48d656f300bd 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -11028,7 +11028,6 @@ void OSDShard::unprime_split_children(spg_t parent, unsigned old_pg_num) void OSDShard::update_scheduler_config() { - std::lock_guard l(shard_lock); scheduler->update_configuration(); } -- 2.47.3