From: Samuel Just <sam.just@inktank.com>
Date: Mon, 15 Sep 2014 22:44:11 +0000 (-0700)
Subject: PGLog::claim_log_and_clear_rollback_info: fix rollback_info_trimmed_to
X-Git-Tag: v0.86~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2518%2Fhead;p=ceph.git

PGLog::claim_log_and_clear_rollback_info: fix rollback_info_trimmed_to

We have been setting it to the old head value.  This is usually
harmless since the new head will virtually always be ahead of the
old head for claim_log_and_clear_rollback_info, but can cause trouble
in some edge cases.

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

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 3c661c00f72d..1b78c3e0fe0f 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -88,8 +88,8 @@ struct PGLog {
       assert(rollback_info_trimmed_to_riter == log.rbegin());
 
       log = o.log;
-      rollback_info_trimmed_to = head;
       head = o.head;
+      rollback_info_trimmed_to = head;
       tail = o.tail;
       index();
     }