osd: der, prior_set may contain down osds

Incorrectly cleaned this up a few commits back.

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e813da472a90f5d2f084019e6df3b76239cda616..967babadcbe51674f826d68e34e39bb356bb159d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1086,10 +1086,13 @@ bool PG::recover_master_log(map< int, map<pg_t,Query> >& query_map)
       continue;
     }
     
-    assert(osd->osdmap->is_up(*it));
-    dout(10) << " querying info from osd" << *it << dendl;
-    query_map[*it][info.pgid] = Query(Query::INFO, info.history);
-    peer_info_requested.insert(*it);
+    if (osd->osdmap->is_up(*it)) {
+      dout(10) << " querying info from osd" << *it << dendl;
+      query_map[*it][info.pgid] = Query(Query::INFO, info.history);
+      peer_info_requested.insert(*it);
+    } else {
+      dout(10) << " not querying info from down osd" << *it << dendl;
+    }
   }
   if (missing_info)
     return false;