From: Sage Weil <sage@inktank.com>
Date: Wed, 26 Jun 2013 04:06:14 +0000 (-0700)
Subject: mon/PaxosService: rename scrub
X-Git-Tag: v0.67-rc1~175^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8d04a2a8b68f0f392361cded3123b3bd800f939;p=ceph.git

mon/PaxosService: rename scrub

Make the name patch the one in Paxos.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 345fa36cb41b..538cc8a4f71c 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -122,7 +122,7 @@ void PaxosService::refresh(bool *need_bootstrap)
 }
 
 
-void PaxosService::scrub()
+void PaxosService::remove_legacy_versions()
 {
   dout(10) << __func__ << dendl;
   if (!mon->store->exists(get_service_name(), "conversion_first"))
@@ -274,7 +274,7 @@ void PaxosService::_active()
   }
   dout(10) << "_active" << dendl;
 
-  scrub();
+  remove_legacy_versions();
 
   // create pending state?
   if (mon->is_leader() && is_active()) {
diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index 5975cb94e496..8cd8908556bb 100644
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -261,7 +261,7 @@ private:
    * Scrub our versions after we convert the store from the old layout to
    * the new k/v store.
    */
-  void scrub();
+  void remove_legacy_versions();
 
 public:
   /**