PG: merge_old_entry: merged delete might not be in missing

If the new log does not contain an entry for that oid, it might not yet
be in missing, and we would need to add it.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index b53860617034290ca41e61eab0e910fde2d12dda..b81079cfc902d73559cee2527d052e0a995d2316 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -356,7 +356,7 @@ bool PG::merge_old_entry(ObjectStore::Transaction& t, Log::Entry& oe)
       } else {
        // old delete, new update.
        dout(20) << "merge_old_entry  had " << oe << " new " << ne << " : missing" << dendl;
-       assert(missing.is_missing(oe.soid));
+       missing.revise_need(ne.soid, ne.version);
       }
     } else {
       if (ne.is_delete()) {