From: Sage Weil <sage@inktank.com>
Date: Mon, 23 Jun 2014 17:47:24 +0000 (-0700)
Subject: osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately
X-Git-Tag: v0.83~64^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57c5d05827895e4eb320110a902c7fb6ebcccd11;p=ceph.git

osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c4d5b19d2c71..b3fdd48490ef 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6825,6 +6825,8 @@ bool OSD::compat_must_dispatch_immediately(PG *pg)
     tmpacting = pg->actingbackfill;
   } else {
     for (unsigned i = 0; i < pg->acting.size(); ++i) {
+      if (pg->acting[i] == CRUSH_ITEM_NONE)
+	continue;
       tmpacting.insert(
 	pg_shard_t(
 	  pg->acting[i],
@@ -6835,7 +6837,7 @@ bool OSD::compat_must_dispatch_immediately(PG *pg)
   for (set<pg_shard_t>::iterator i = tmpacting.begin();
        i != tmpacting.end();
        ++i) {
-    if (i->osd == whoami)
+    if (i->osd == whoami || i->osd == CRUSH_ITEM_NONE)
       continue;
     ConnectionRef conn =
       service.get_con_osd_cluster(i->osd, pg->get_osdmap()->get_epoch());