From: Samuel Just <sjust@redhat.com>
Date: Fri, 13 May 2016 01:06:35 +0000 (-0700)
Subject: PGLog: rename claim_log_clear_rollback_info to reset_backfill_claim_log
X-Git-Tag: ses5-milestone5~325^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f014f0c1e09b10dde35dae50bb8ae6171b469005;p=ceph.git

PGLog: rename claim_log_clear_rollback_info to reset_backfill_claim_log

This clarifies that the state should be reset as if we are restarting
backfill: this includes the missing set.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 8378cdbbd9d..c668c3d1548 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -7017,7 +7017,7 @@ boost::statechart::result PG::RecoveryState::Stray::react(const MLogRec& logevt)
     pg->dirty_big_info = true;  // maybe.
 
     PGLogEntryHandler rollbacker;
-    pg->pg_log.claim_log_and_clear_rollback_info(msg->log, &rollbacker);
+    pg->pg_log.reset_backfill_claim_log(msg->log, &rollbacker);
     rollbacker.apply(pg, t);
 
     pg->pg_log.reset_backfill();
diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 7f27517af52..9b33b5e42d9 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -596,7 +596,7 @@ public:
 
   //////////////////// get or set log & missing ////////////////////
 
-  void claim_log_and_clear_rollback_info(const pg_log_t &o, LogEntryHandler *h) {
+  void reset_backfill_claim_log(const pg_log_t &o, LogEntryHandler *h) {
     log.can_rollback_to = log.head;
     log.advance_rollback_info_trimmed_to(log.head, h);
     log.claim_log_and_clear_rollback_info(o);
diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc
index 8f39c1111a2..7a8db878b2d 100644
--- a/src/test/osd/TestPGLog.cc
+++ b/src/test/osd/TestPGLog.cc
@@ -483,7 +483,7 @@ TEST_F(PGLogTest, rewind_divergent_log) {
     rewind_divergent_log(t, eversion_t(1, 5), info, &h,
 			 dirty_info, dirty_big_info);
     pg_log_t log;
-    claim_log_and_clear_rollback_info(log, &h);
+    reset_backfill_claim_log(log, &h);
   }
 }