From: Sage Weil <sage@inktank.com>
Date: Fri, 12 Jul 2013 21:59:30 +0000 (-0700)
Subject: mon/PaxosService: remove redundant check
X-Git-Tag: v0.67-rc1~74^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f37c36e817459938de152fe66de9a773773bfcd9;p=ceph.git

mon/PaxosService: remove redundant check

_active checks is_active() and rescheduled itself already.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 973277d38e84..e20322a4a6b5 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -254,10 +254,7 @@ void PaxosService::election_finished()
   finish_contexts(g_ceph_context, waiting_for_finished_proposal, -EAGAIN);
 
   // make sure we update our state
-  if (is_active())
-    _active();
-  else
-    wait_for_active(new C_Active(this));
+  _active();
 }
 
 void PaxosService::_active()