elector: make ElectionLogic private to Elector; undo most public shenanigans

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

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index dcf62b29fd360159664e3fe1d0356211ed1a411a..b7b414d4fa6d1df1c073eaa732eafc50a7022642 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -28,7 +28,7 @@
 static ostream& _prefix(std::ostream *_dout, Elector* elector) {
   return *_dout << "mon." << elector->mon->name << "@" << elector->mon->rank
                << "(" << elector->mon->get_state_name()
-               << ").elector(" << elector->logic.epoch << ") ";
+               << ").elector(" << elector->get_epoch() << ") ";
 }
 
 void ElectionLogic::persist_epoch(epoch_t e)

diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index 02beaa11710b6ab86a8a82461bc8c847e406f5d1..8ade46e6be88d6c0ac94e7e20eac68af475e5f58 100644 (file)
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -76,11 +76,7 @@ class Elector {
    * @{
    */
   friend class ElectionLogic;
-  // FIXME!
-  public:
   ElectionLogic logic;
-  Elector *elector;
-  bool is_current_member(int rank);
 
    /**
    * @defgroup Elector_h_internal_types Internal Types
@@ -106,9 +102,11 @@ class Elector {
   /**
    * The Monitor instance associated with this class.
    */
+  // FIXME!
+public:
   Monitor *mon;
-
 private:
+
   /**
    * Event callback responsible for dealing with an expired election once a
    * timer runs out and fires up.
@@ -368,14 +366,16 @@ private:
   void handle_nak(MonOpRequestRef op);
   
  public:
+  Elector *elector;
+  bool is_current_member(int rank);
+  
   /**
    * Create an Elector class
    *
    * @param m A Monitor instance
    */
   explicit Elector(Monitor *m) : logic(this),
-                                elector(this),
-                                mon(m) {}
+                                mon(m), elector(this) {}
 
   /**
    * Initiate the Elector class.