PGLog::rewind_divergent_log: fix rollback_info_trimmed_to before index()

Fixes: #13965 Signed-off-by: Samuel Just <sjust@redhat.com> (cherry picked from commit 053ee91)
ceph · Apr 30, 2016 · d96086a · d96086a
1 parent e79162d
commit d96086a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
@@ -526,6 +526,9 @@ void PGLog::rewind_divergent_log(ObjectStore::Transaction& t, eversion_t newhead
   if (info.last_complete > newhead)
     info.last_complete = newhead;
 
+  if (log.rollback_info_trimmed_to > newhead)
+    log.rollback_info_trimmed_to = newhead;
+
   log.index();
 
   map<eversion_t, hobject_t> new_priors;