From b9dee2285d9fe8533fa98c940d5af7b0b81f3d33 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 20 Aug 2013 11:26:57 -0700 Subject: [PATCH] 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 Reviewed-by: Joao Eduardo Luis --- src/mon/Paxos.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 445413da13b..0fcd3b13903 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -793,17 +793,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() -- 2.47.3