From a50fbe2b982e5d19040f4ae5795455dde3a9a02e Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 12 Oct 2011 15:44:08 -0700 Subject: [PATCH] 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 --- src/osd/PG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b53860617034..b81079cfc902 100644 --- 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()) { -- 2.47.3