From: Samuel Just <sam.just@inktank.com>
Date: Fri, 10 Oct 2014 20:53:29 +0000 (-0700)
Subject: PGLog::IndexedLog::trim(): rollback_info_trimmed_to_riter may be log.rend()
X-Git-Tag: v0.87~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d458b4f0f31161f561ff98e58ed979cf20c6f588;p=ceph.git

PGLog::IndexedLog::trim(): rollback_info_trimmed_to_riter may be log.rend()

Fixes: #9731
Backport: giant, firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 80b0f85330c47..60390a2a5962f 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -101,7 +101,8 @@ void PGLog::IndexedLog::trim(
 
     unindex(e);         // remove from index,
 
-    if (e.version == rollback_info_trimmed_to_riter->version) {
+    if (rollback_info_trimmed_to_riter == log.rend() ||
+	e.version == rollback_info_trimmed_to_riter->version) {
       log.pop_front();
       rollback_info_trimmed_to_riter = log.rend();
     } else {