From: Samuel Just <sam.just@inktank.com>
Date: Wed, 6 Mar 2013 01:43:39 +0000 (-0800)
Subject: PG::read_log: fix assert, split may introduce holes in the log
X-Git-Tag: v0.60~78^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be95af7bf8bca651ff0d28bf488ab3cb149708a5;p=ceph.git

PG::read_log: fix assert, split may introduce holes in the log

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index bee5be2cc0be..5bd6615fce91 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5117,7 +5117,7 @@ bool PG::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
 	dout(20) << "read_log " << e << dendl;
 	if (!log.log.empty()) {
 	  pg_log_entry_t last_e(log.log.back());
-	  assert(last_e.version.version == e.version.version - 1);
+	  assert(last_e.version.version < e.version.version);
 	  assert(last_e.version.epoch <= e.version.epoch);
 	}
 	log.log.push_back(e);