]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PGLog::IndexedLog::trim(): rollback_info_trimmed_to_riter may be log.rend()
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:57:49 +0000 (13:57 -0700)
Fixes: #9731
Backport: giant, firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit d458b4f0f31161f561ff98e58ed979cf20c6f588)

src/osd/PGLog.cc

index 9523b12bf9281baae613d9f23ba3dd4971f3f804..3f61346d94bc0df747231f5445c35a4b71f232fa 100644 (file)
@@ -99,7 +99,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 {