Merge pull request #4416 from xinxinsh/wip-10976-firefly

fix PG::all_unfound_are_queried_or_lost for non-existent osds Reviewed-by: Samuel Just <sjust@redhat.com>
ceph · May 15, 2015 · ac7d28a · ac7d28a
2 parents f273792 + 1f6b1bb
commit ac7d28a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
@@ -763,6 +763,8 @@ bool PG::all_unfound_are_queried_or_lost(const OSDMapRef osdmap) const
     if (iter != peer_info.end() &&
         (iter->second.is_empty() || iter->second.dne()))
       continue;
+    if (!osdmap->exists(peer->osd))
+      continue;
     const osd_info_t &osd_info(osdmap->get_info(peer->osd));
     if (osd_info.lost_at <= osd_info.up_from) {
       // If there is even one OSD in might_have_unfound that isn't lost, we