osd: replica may have missing/lost objects when it activates; the primary is responsi...

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0474014c9fa0083b59f9dc5806fd6fc48656b900..d31b71120fafafef67890f6d8553a2a2c443d391 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2464,7 +2464,6 @@ void OSD::_process_pg_info(epoch_t epoch, int from,
       // merge log
       pg->merge_log(log, missing, from);
       pg->proc_missing(log, missing, from);
-      assert(pg->missing.num_lost() == 0);
       
       // ok activate!
       pg->activate(t, info_map);

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 2df6af9410d6aad31fd5b1cea8a4b21216e4b704..3558014c73300841b737b859e58baaa57230127e 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -409,16 +409,16 @@ void PG::proc_missing(Log &olog, Missing &omissing, int fromosd)
         missing.loc[p->first] = omissing.loc[p->first];
       } else {
         dout(10) << "proc_missing " << p->first << " " << p->second
-                 << " also LOST on source, osd" << fromosd << dendl;
+                 << " also missing on osd" << fromosd << dendl;
       }
     } 
     else if (p->second <= olog.top) {
       dout(10) << "proc_missing " << p->first << " " << p->second
-               << " is on source, osd" << fromosd << dendl;
+               << " is on osd" << fromosd << dendl;
       missing.loc[p->first] = fromosd;
     } else {
       dout(10) << "proc_missing " << p->first << " " << p->second
-               << " > olog.top " << olog.top << ", not found...."
+               << " > olog.top " << olog.top << ", also missing on osd" << fromosd
                << dendl;
     }
   }