From: Sage Weil <sage@inktank.com>
Date: Tue, 30 Jul 2013 00:10:09 +0000 (-0700)
Subject: mon: drop useless sync_reset() calls
X-Git-Tag: v0.67-rc3~1^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=634dcf3362a068b0b459cc64bd31db7768a1388b;p=ceph.git

mon: drop useless sync_reset() calls

These are both right before bootstrap(), which also resets.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 92e6fa4ca76..3b19b514054 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -923,8 +923,6 @@ void Monitor::sync_finish(version_t last_committed)
   t.erase("mon_sync", "last_committed_floor");
   store->apply_transaction(t);
 
-  sync_reset();
-
   assert(g_conf->mon_sync_requester_kill_at != 9);
 
   init_paxos();
@@ -1173,7 +1171,6 @@ void Monitor::handle_sync_chunk(MMonSync *m)
 void Monitor::handle_sync_no_cookie(MMonSync *m)
 {
   dout(10) << __func__ << dendl;
-  sync_reset();
   bootstrap();
 }