]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PGLog::rewind_divergent_log: we can rewind to tail, fix assert
authorSamuel Just <sam.just@inktank.com>
Fri, 13 Dec 2013 20:43:00 +0000 (12:43 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 22 Jan 2014 22:38:26 +0000 (14:38 -0800)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PGLog.cc

index f9a6b97b94d0546c613c52e68efef6c00d9bc290..a157b6f58e4c62c173a45f9a57139a2a2fae9d0e 100644 (file)
@@ -338,7 +338,7 @@ void PGLog::rewind_divergent_log(ObjectStore::Transaction& t, eversion_t newhead
                       bool &dirty_info, bool &dirty_big_info)
 {
   dout(10) << "rewind_divergent_log truncate divergent future " << newhead << dendl;
-  assert(newhead > log.tail);
+  assert(newhead >= log.tail);
 
   list<pg_log_entry_t>::iterator p = log.log.end();
   list<pg_log_entry_t> divergent;