elector: split handle_propose in two and hoist into ElectionLogic

Also add a bunch of utility functions that will need to
get better implementations later

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index fd24ef5b7e576a4fedddb8ab16ef6c068659ef36..bc1bb438b872afc763c897500c55b76217a5652c 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -46,6 +46,27 @@ void ElectionLogic::validate_store()
   ceph_assert(r >= 0);
 }
 
+bool ElectionLogic::elector_is_current_member(int rank)
+{
+  return elector->is_current_member(rank);
+}
+
+bool Elector::is_current_member(int rank)
+{
+  return mon->quorum.count(rank);
+}
+
+void ElectionLogic::elector_trigger_new_election()
+{
+  elector->mon->start_election();
+}
+
+int ElectionLogic::elector_my_rank()
+{
+  return elector->mon->rank;
+}
+
+
 void Elector::init()
 {
   logic.epoch = mon->store->get(Monitor::MONITOR_NAME, "election_epoch");
@@ -296,43 +317,49 @@ void Elector::handle_propose(MonOpRequestRef op)
             << " without required mon_features " << missing
             << dendl;
     nak_old_peer(op);
-  } else if (m->epoch > logic.epoch) {
-    logic.bump_epoch(m->epoch);
-  } else if (m->epoch < logic.epoch) {
+  }
+  logic.handle_propose_logic(m->epoch, from);
+}
+
+void ElectionLogic::handle_propose_logic(epoch_t mepoch, int from)
+{
+  if (mepoch > epoch) {
+    bump_epoch(mepoch);
+  } else if (mepoch < epoch) {
     // got an "old" propose,
-    if (logic.epoch % 2 == 0 &&    // in a non-election cycle
-       mon->quorum.count(from) == 0) {  // from someone outside the quorum
+    if (epoch % 2 == 0 &&    // in a non-election cycle
+       !elector_is_current_member(from)) {  // from someone outside the quorum
       // a mon just started up, call a new election so they can rejoin!
-      dout(5) << " got propose from old epoch, quorum is " << mon->quorum 
-             << ", " << m->get_source() << " must have just started" << dendl;
+      dout(5) << " got propose from old epoch, "
+             << from << " must have just started" << dendl;
       // we may be active; make sure we reset things in the monitor appropriately.
-      mon->start_election();
+      elector_trigger_new_election();
     } else {
       dout(5) << " ignoring old propose" << dendl;
       return;
     }
   }
 
-  if (mon->rank < from) {
+  if (elector_my_rank() < from) {
     // i would win over them.
-    if (logic.leader_acked >= 0) {        // we already acked someone
-      ceph_assert(logic.leader_acked < from);  // and they still win, of course
-      dout(5) << "no, we already acked " << logic.leader_acked << dendl;
+    if (leader_acked >= 0) {        // we already acked someone
+      ceph_assert(leader_acked < from);  // and they still win, of course
+      dout(5) << "no, we already acked " << leader_acked << dendl;
     } else {
       // wait, i should win!
-      if (!logic.electing_me) {
-       mon->start_election();
+      if (!electing_me) {
+       elector_trigger_new_election();
       }
     }
   } else {
     // they would win over me
-    if (logic.leader_acked < 0 ||      // haven't acked anyone yet, or
-       logic.leader_acked > from ||   // they would win over who you did ack, or
-       logic.leader_acked == from) {  // this is the guy we're already deferring to
-      defer(from);
+    if (leader_acked < 0 ||      // haven't acked anyone yet, or
+       leader_acked > from ||   // they would win over who you did ack, or
+       leader_acked == from) {  // this is the guy we're already deferring to
+      elector->defer(from);
     } else {
       // ignore them!
-      dout(5) << "no, we already acked " << logic.leader_acked << dendl;
+      dout(5) << "no, we already acked " << leader_acked << dendl;
     }
   }
 }

diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index f6d49b5669fab66512acea9ad1b502b3e05efcb9..e1659f37cb4d28513ef60ab86503e2588596c2d2 100644 (file)
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -39,11 +39,15 @@ public:
                              electing_me(false), leader_acked(-1) {}
 
   void bump_epoch(epoch_t e);
+  void handle_propose_logic(epoch_t mepoch, int from);
   
 private:
+  // call-outs
   void persist_epoch(epoch_t e);
   void validate_store();
-  
+  bool elector_is_current_member(int rank);
+  void elector_trigger_new_election();
+  int elector_my_rank();
 };
 
 /**
@@ -61,6 +65,8 @@ class Elector {
   public:
   ElectionLogic logic;
   Elector *elector;
+  bool is_current_member(int rank);
+
    /**
    * @defgroup Elector_h_internal_types Internal Types
    * @{