Merge pull request ceph#1468 from ceph/wip-7732

PG::build_might_have_unfound: check pg_whomai, not osd whoami Reviewed-by: Sage Weil <[email protected]>
dano · Mar 15, 2014 · 677b30c · 677b30c
2 parents affcc11 + 979e8b4
commit 677b30c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
@@ -1360,11 +1360,9 @@ void PG::build_might_have_unfound()
     std::vector<int>::const_iterator a = interval.acting.begin();
     std::vector<int>::const_iterator a_end = interval.acting.end();
     for (; a != a_end; ++a, ++i) {
-      if (*a != CRUSH_ITEM_NONE && *a != osd->whoami)
-	might_have_unfound.insert(
-	  pg_shard_t(
-	    *a,
-	    pool.info.ec_pool() ? i : ghobject_t::NO_SHARD));
+      pg_shard_t shard(*a, pool.info.ec_pool() ? i : ghobject_t::NO_SHARD);
+      if (*a != CRUSH_ITEM_NONE && shard != pg_whoami)
+	might_have_unfound.insert(shard);
     }
   }