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 7c11aa90f8a1391961a04178790cece489acd381..8521af9eba53b20d2686a04274ccd2d9e52bba5f 100644 (file)
--- 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;