From: Sage Weil <sage@inktank.com>
Date: Fri, 5 Jul 2013 23:46:38 +0000 (-0700)
Subject: mon: drop single-use is_sync_on_going() check
X-Git-Tag: v0.67-rc1~126^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbfb5b41b6fd7418397e5104198de371d6e05a1f;p=ceph.git

mon: drop single-use is_sync_on_going() check

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 04531d10916b..e8da4ae6fcba 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -412,7 +412,7 @@ int Monitor::preinit()
     // We have a potentially inconsistent store state in hands. Get rid of it
     // and start fresh.
     bool clear_store = false;
-    if (is_sync_on_going()) {
+    if (store->exists("mon_sync", "in_sync")) {
       dout(1) << __func__ << " clean up potentially inconsistent store state"
 	      << dendl;
       clear_store = true;
@@ -798,11 +798,6 @@ void Monitor::sync_obtain_latest_monmap(bufferlist &bl)
   latest_monmap.encode(bl, CEPH_FEATURES_ALL);
 }
 
-bool Monitor::is_sync_on_going()
-{
-  return store->exists("mon_sync", "in_sync");
-}
-
 void Monitor::sync_reset()
 {
   if (sync_timeout_event) {
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index b6d62c4dd73e..b875fbc6ee09 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -291,11 +291,6 @@ private:
    */
   void sync_obtain_latest_monmap(bufferlist &bl);
 
-  /**
-   * check if a sync is in progress
-   */
-  bool is_sync_on_going();
-
   /**
    * Start the synchronization efforts.
    *