From: Sage Weil <sage@inktank.com>
Date: Fri, 12 Jul 2013 22:04:00 +0000 (-0700)
Subject: mon/PaxosService: assert not proposing in propose_pending
X-Git-Tag: v0.67-rc1~78^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7666c33a1d8e8706ca764fca12b302fa10a5a0b8;p=ceph.git

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>
---

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index efe60aafd691..43c7504d08bb 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;