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 04531d10916bc788dce746624b58b8fc88f9d2ba..e8da4ae6fcbab478d95c758de45e939f8ea90fe7 100644 (file)
--- 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 b6d62c4dd73e13587b8991fc464ce81108cbef3a..b875fbc6ee09f23da307fd117e0ae84f9134e633 100644 (file)
--- 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.
    *