From d458b4f0f31161f561ff98e58ed979cf20c6f588 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 10 Oct 2014 13:53:29 -0700 Subject: [PATCH] PGLog::IndexedLog::trim(): rollback_info_trimmed_to_riter may be log.rend() Fixes: #9731 Backport: giant, firefly Signed-off-by: Samuel Just --- src/osd/PGLog.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index 80b0f85330c4..60390a2a5962 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 { -- 2.47.3