From: Samuel Just <sjust@redhat.com>
Date: Thu, 3 Dec 2015 01:20:19 +0000 (-0800)
Subject: PGLog::rewind_divergent_log: fix rollback_info_trimmed_to before index()
X-Git-Tag: v0.94.8~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8849%2Fhead;p=ceph.git

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 053ee919059b2671d40110e8dff8615dc13d34e0)
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 7c11aa90f8a..8521af9eba5 100644
--- 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;