]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: respect NODOWN on osd failure checks 6012/head
authorSage Weil <sage@redhat.com>
Sun, 20 Sep 2015 18:49:09 +0000 (14:49 -0400)
committerSage Weil <sage@redhat.com>
Mon, 21 Sep 2015 18:36:10 +0000 (14:36 -0400)
Backport: hammer, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index 5e23d3de61726e31248ec24ad3a6ec4e1f62c002..bf50b178274a44a8a99fb178d99ad650c7824c42 100644 (file)
@@ -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);
+    }
   }
 }