diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-13 00:04:00 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-15 22:42:53 +0200 |
| commit | 7666c33a1d8e8706ca764fca12b302fa10a5a0b8 (patch) | |
| tree | 355ad56d31a3416de260b441f5571e547aefa027 /src/mon/PaxosService.cc | |
| parent | mon/Paxos: separate proposal commit from the end of the round (diff) | |
| download | ceph-7666c33a1d8e8706ca764fca12b302fa10a5a0b8.tar.xz ceph-7666c33a1d8e8706ca764fca12b302fa10a5a0b8.zip | |
mon/PaxosService: assert not proposing in propose_pending
Drop the useless active check after the assert, too.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/mon/PaxosService.cc')
| -rw-r--r-- | src/mon/PaxosService.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index efe60aafd69..43c7504d08b 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -163,10 +163,9 @@ void PaxosService::propose_pending() { dout(10) << "propose_pending" << dendl; assert(have_pending); + assert(!proposing); assert(mon->is_leader()); assert(is_active()); - if (!is_active()) - return; if (proposal_timer) { dout(10) << " canceling proposal_timer " << proposal_timer << dendl; |