]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMap.cc: check if osd is out in subtree_type_is_down 15250/head
authorNeha Ojha <nojha@redhat.com>
Tue, 23 May 2017 22:35:16 +0000 (15:35 -0700)
committerNeha Ojha <nojha@redhat.com>
Tue, 23 May 2017 22:35:16 +0000 (15:35 -0700)
Signed-off-by: Neha Ojha <nojha@redhat.com>
src/osd/OSDMap.cc

index 32aeb4870d89294c142c20e0f3858e4308f92f47..cbeb791ff668d5ef6ecf2f029717b507e7ab04f0 100644 (file)
@@ -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;
   }