From: Kefu Chai <kchai@redhat.com>
Date: Thu, 3 Sep 2020 15:02:58 +0000 (+0800)
Subject: mon/OSDMonitor: only take in osd into consideration when trimming osdmaps
X-Git-Tag: wip-pdonnell-testing-20200918.022351~134^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=79175740cf2394bba74163ca8a5131419b9641ed;p=ceph-ci.git

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 <kchai@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index fc4bf04e12f..78a8b67cbf6 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2251,7 +2251,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 (epoch < floor &&
-        osdmap.is_out(osd)) {
+        osdmap.is_in(osd)) {
       floor = epoch;
     }
   }