From: Sage Weil <sage@newdream.net>
Date: Mon, 10 Aug 2009 21:26:24 +0000 (-0700)
Subject: osd: der, prior_set may contain down osds
X-Git-Tag: v0.13~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=097b468f090fb52bbe47591918bac9a889cbba00;p=ceph.git

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 e813da472a90..967babadcbe5 100644
--- 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;