osd: drop broken (and useless) PG::merge_log assert

The assert should be olog.backlog, not log.backlog.  But it's the same
condition as the if guard that's 3 lines up, making it pretty useless.
Just drop it.

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 576fada1ed01bc4838dcc48368bd4cce8d89aa18..46c9ebb5121706fb5746392446a24d2304f9b91d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -339,7 +339,6 @@ void PG::merge_log(ObjectStore::Transaction& t,
     } else {
       // primary should have requested our backlog during peer().
     }
-    assert(log.backlog || log.head == eversion_t());
 
     hash_map<sobject_t, Log::Entry*> old_objects;
     old_objects.swap(log.objects);