diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-23 10:23:43 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-23 10:23:43 -0700 |
| commit | 87cef3d5c314f1d520a90ee27c2b349958bd30e3 (patch) | |
| tree | 9e572705da1f295d5a493dd003d13f344071df90 | |
| parent | 6af640517f6fad797ccb15ae4f0b8439d557c423 (diff) | |
| download | ceph-87cef3d5c314f1d520a90ee27c2b349958bd30e3.tar.gz | |
mon: drop unnecessary conditionals
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/mon/Paxos.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index bfb9ed4f5dd..3311d7bae93 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -1081,8 +1081,8 @@ void Paxos::leader_init() { cancel_events(); new_value.clear(); - if (!proposals.empty()) - finish_contexts(g_ceph_context, proposals, -EAGAIN); + + finish_contexts(g_ceph_context, proposals, -EAGAIN); if (mon->get_quorum().size() == 1) { state = STATE_ACTIVE; @@ -1118,9 +1118,7 @@ void Paxos::restart() state = STATE_RECOVERING; - if (!proposals.empty()) - finish_contexts(g_ceph_context, proposals, -EAGAIN); - + finish_contexts(g_ceph_context, proposals, -EAGAIN); finish_contexts(g_ceph_context, waiting_for_commit, -EAGAIN); finish_contexts(g_ceph_context, waiting_for_active, -EAGAIN); } |