OSD: activate_map should not do_peer on a replaying pg

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a347be26197b6273a4bca7df9ab8907d2e928bb1..731c70e90c4612817e0efd6031ec3d27ebbc349f 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3323,7 +3323,7 @@ void OSD::activate_map(ObjectStore::Transaction& t, list<Context*>& tfin)
     else if (pg->is_primary() &&
             !pg->is_active()) {
       // i am (inactive) primary
-      if (!pg->is_peering() || 
+      if ((!pg->is_peering() && !pg->is_replay()) || 
          (pg->need_up_thru && up_thru >= pg->info.history.same_acting_since))
        pg->do_peer(t, tfin, query_map, &info_map);
     }