From: Neha Ojha <nojha@redhat.com>
Date: Tue, 23 May 2017 22:35:16 +0000 (-0700)
Subject: osd/OSDMap.cc: check if osd is out in subtree_type_is_down
X-Git-Tag: v12.1.1~65^2~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15250%2Fhead;p=ceph.git

osd/OSDMap.cc: check if osd is out in subtree_type_is_down

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 32aeb4870d8..cbeb791ff66 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -298,10 +298,12 @@ bool OSDMap::subtree_type_is_down(CephContext *cct, int id, int subtree_type, se
 {
   if (id >= 0) {
     bool is_down_ret = is_down(id);
-    if (is_down_ret) {
-      down_in_osds->insert(id);
-    } else {
-      up_in_osds->insert(id);
+    if (!is_out(id)) {
+      if (is_down_ret) {
+        down_in_osds->insert(id);
+      } else {
+        up_in_osds->insert(id);
+      }
     }
     return is_down_ret;
   }