From: Samuel Just <sam.just@inktank.com>
Date: Wed, 30 Oct 2013 23:54:39 +0000 (-0700)
Subject: PGLog: remove obsolete assert in merge_log
X-Git-Tag: v0.67.8~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1559%2Fhead;p=ceph.git

PGLog: remove obsolete assert in merge_log

This assert assumes that if olog.head != log.head, olog contains
a log entry at log.head, which may not be true since pg splitting
might have left the log with arbitrary holes.

Related: 0c2769d3321bff6e85ec57c85a08ee0b8e751bcb
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 353813b2e1a98901b876790c7c531f8a202c661d)
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 4b33479cb2cc..73ee61920e8f 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -422,8 +422,6 @@ void PGLog::merge_log(ObjectStore::Transaction& t,
       log.index(*to);
       dout(15) << *to << dendl;
     }
-    assert(to != olog.log.end() ||
-	   (olog.head == info.last_update));
       
     // splice into our log.
     log.log.splice(log.log.begin(),