]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: Remove override for osd_async_recovery_min_cost for mclock profiles 38993/head
authorSridhar Seshasayee <sseshasa@redhat.com>
Mon, 18 Jan 2021 08:34:46 +0000 (14:04 +0530)
committerNeha Ojha <nojha@redhat.com>
Wed, 20 Jan 2021 20:43:10 +0000 (20:43 +0000)
commit3067a3b3c48c954300e5ceb1dd1ea48341e73d0a
tree30255b33316dd77e2e71d1f94a4ee85171861f40
parent76e46a2e520a4dc804de2c33425c63caaa22a6d8
osd: Remove override for osd_async_recovery_min_cost for mclock profiles

Overriding osd_async_recovery_min_cost as part of enabling a built-in
mclock profile has the undesirable side effect of peers not choosing
the correct async recovery targets if osds are using mixed schedulers
(this could happen during upgrades or if "debug_random" is set for
osd_op_queue config option). Due to the above, osds get into a
"choose_acting" loop during peering.

The solution is to remove the override of osd_async_recovery_min_cost.

Fixes: https://tracker.ceph.com/issues/48906
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 922d93f4491207411b4ee9427e49ccf08b0ef648)
src/osd/OSD.cc
src/osd/scheduler/mClockScheduler.cc