From 0769310ccd4e0dceebd8ea601e8eb5c0928e0603 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 15 Sep 2014 15:44:11 -0700 Subject: [PATCH] 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 --- src/osd/PGLog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 3c661c00f72..1b78c3e0fe0 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(); }