From: Sage Weil <sage@redhat.com>
Date: Sun, 20 Sep 2015 18:49:09 +0000 (-0400)
Subject: mon/OSDMonitor: respect NODOWN on osd failure checks
X-Git-Tag: v9.1.0~78^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c27b73f965602bfd67ec0714f5b33c509316eeae;p=ceph.git

mon/OSDMonitor: respect NODOWN on osd failure checks

Backport: hammer, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5e23d3de6172..bf50b178274a 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1623,7 +1623,9 @@ void OSDMonitor::check_failures(utime_t now)
   for (map<int,failure_info_t>::iterator p = failure_info.begin();
        p != failure_info.end();
        ++p) {
-    check_failure(now, p->first, p->second);
+    if (can_mark_down(p->first)) {
+      check_failure(now, p->first, p->second);
+    }
   }
 }