From 2f4a6b876ef0615846c0c2fc1601c15bf7e3630f Mon Sep 17 00:00:00 2001 From: Zhansong Gao Date: Mon, 11 Nov 2024 13:26:03 +0800 Subject: [PATCH] mds: fix option mds_bal_overload_epochs When option mds_bal_overload_epochs was added, two positions should have been modified, but one of them was overlooked. Fixes: https://tracker.ceph.com/issues/68953 Signed-off-by: Zhansong Gao --- src/mds/MDBalancer.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc index 3fa4acca1b4..209dff4bb74 100644 --- a/src/mds/MDBalancer.cc +++ b/src/mds/MDBalancer.cc @@ -830,8 +830,9 @@ void MDBalancer::prep_rebalance(int beat) dout(7) << " i am underloaded or barely overloaded, doing nothing." << dendl; return; } + auto overload_epochs = g_conf().get_val("mds_bal_overload_epochs"); // am i over long enough? - if (last_epoch_under && beat_epoch - last_epoch_under < g_conf()->mds_bal_overload_epochs) { + if (last_epoch_under && beat_epoch - last_epoch_under < overload_epochs) { dout(7) << " i am overloaded, but only for " << (beat_epoch - last_epoch_under) << " epochs" << dendl; return; } @@ -854,7 +855,7 @@ void MDBalancer::prep_rebalance(int beat) importer_set.insert(it->second); } else { int mds_last_epoch_under = mds_last_epoch_under_map[it->second]; - if (!(mds_last_epoch_under && beat_epoch - mds_last_epoch_under < 2)) { + if (!(mds_last_epoch_under && beat_epoch - mds_last_epoch_under < overload_epochs)) { dout(15) << " mds." << it->second << " is exporter" << dendl; exporters.insert(pair(it->first,it->second)); exporter_set.insert(it->second); -- 2.39.5