From d96086af5d54a7450f3823210323b9fe08fc075a Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Wed, 2 Dec 2015 17:20:19 -0800
Subject: [PATCH] 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)
---
 src/osd/PGLog.cc | 3 +++
 1 file changed, 3 insertions(+)

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;
-- 
2.47.3