From: Sage Weil <sage@inktank.com>
Date: Tue, 20 Aug 2013 18:26:57 +0000 (-0700)
Subject: mon/Paxos: cleanup: use do_refresh from handle_commit
X-Git-Tag: v0.67.3~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f248383bacff76203fa94716cfdf6cf766da24a7;p=ceph.git

mon/Paxos: cleanup: use do_refresh from handle_commit

This avoid duplicated code by using the helper created exactly for this
purpose.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit b9dee2285d9fe8533fa98c940d5af7b0b81f3d33)
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 7830108c4430..9c7e50b0c5f8 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -802,17 +802,11 @@ void Paxos::handle_commit(MMonPaxos *commit)
 
   store_state(commit);
 
-  commit->put();
-
-  bool need_bootstrap = false;
-  mon->refresh_from_paxos(&need_bootstrap);
-  if (need_bootstrap) {
-    dout(10) << " doing requested bootstrap" << dendl;
-    mon->bootstrap();
-    return;
+  if (do_refresh()) {
+    finish_contexts(g_ceph_context, waiting_for_commit);
   }
 
-  finish_contexts(g_ceph_context, waiting_for_commit);
+  commit->put();
 }
 
 void Paxos::extend_lease()