]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PGLog::IndexedLog::trim(): rollback_info_trimmed_to_riter may be log.rend() 2707/head
authorSamuel Just <sam.just@inktank.com>
Fri, 10 Oct 2014 20:53:29 +0000 (13:53 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 10 Oct 2014 20:55:42 +0000 (13:55 -0700)
Fixes: #9731
Backport: giant, firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PGLog.cc

index 80b0f85330c4709bc925ef9355ce072047efa585..60390a2a5962f4172161ebf1ee8be49850161434 100644 (file)
@@ -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 {