diff options
author | Sage Weil <sage@inktank.com> | 2013-08-20 11:26:57 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-26 21:33:04 -0700 |
commit | f248383bacff76203fa94716cfdf6cf766da24a7 (patch) | |
tree | 29cfc3ba91080c3bf5ff87ef791031526e3dac34 | |
parent | 02608a12d4e7592784148a62a47d568efc24079d (diff) | |
download | ceph-f248383bacff76203fa94716cfdf6cf766da24a7.tar.gz |
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)
-rw-r--r-- | src/mon/Paxos.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 7830108c443..9c7e50b0c5f 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() |