From 8df0f2f608b0408c963f0e4e72f55fc766fb1f87 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 3 Sep 2020 23:02:58 +0800 Subject: [PATCH] mon/OSDMonitor: only take in osd into consideration when trimming osdmaps we should not take down osd into consideration when trimming osdmap. in e62269c892, we decrease the upper bound of range of osdmaps to be trimmed if the given osd is out. but we should have to decrease it only if the osd in question is still *in*. so, in this change, the min_lec is decreased only if the osd in question is *in*. Fixes: https://tracker.ceph.com/issues/47290 Signed-off-by: Kefu Chai (cherry picked from commit 79175740cf2394bba74163ca8a5131419b9641ed) Conflicts: src/mon/OSDMonitor.cc - trivial resolution --- src/mon/OSDMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index e62d518b9c1..e256d10aa57 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2225,7 +2225,7 @@ epoch_t OSDMonitor::get_min_last_epoch_clean() const // don't trim past the oldest reported osd epoch for (auto& osd_epoch : osd_epochs) { if (osd_epoch.second < floor && - osdmap.is_out(osd_epoch.first)) { + osdmap.is_in(osd_epoch.first)) { floor = osd_epoch.second; } } -- 2.47.3