mds: order MDBalancer header

This follows the coding style guidelines:

https://google.github.io/styleguide/cppguide.html#Declaration_Order

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index 438ffdeb8375521524dca2c06a84c57824fde658..da2f02b99d152d4170b1b2bcd77ea7045459b124 100644 (file)
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -25,8 +25,6 @@ using std::map;
 #include "include/types.h"
 #include "common/Clock.h"
 #include "common/Cond.h"
-#include "CInode.h"
-
 
 class MDSRank;
 class Message;
@@ -37,49 +35,7 @@ class Messenger;
 class MonClient;
 
 class MDBalancer {
- protected:
-  MDSRank *mds;
-  Messenger *messenger;
-  MonClient *mon_client;
-  int beat_epoch;
-
-  int last_epoch_under;  
-  int last_epoch_over; 
-  string bal_code;
-  string bal_version;
-
-  utime_t last_heartbeat;
-  utime_t last_sample;    
-  utime_t rebalance_time; //ensure a consistent view of load for rebalance
-
-  // Dirfrags which are marked to be passed on to MDCache::[split|merge]_dir
-  // just as soon as a delayed context comes back and triggers it.
-  // These sets just prevent us from spawning extra timer contexts for
-  // dirfrags that already have one in flight.
-  set<dirfrag_t>   split_pending, merge_pending;
-
-  // per-epoch scatter/gathered info
-  map<mds_rank_t, mds_load_t>  mds_load;
-  map<mds_rank_t, double>       mds_meta_load;
-  map<mds_rank_t, map<mds_rank_t, float> > mds_import_map;
-
-  // per-epoch state
-  double          my_load, target_load;
-  map<mds_rank_t,double> my_targets;
-  map<mds_rank_t,double> imported;
-  map<mds_rank_t,double> exported;
-
-  map<mds_rank_t, int> old_prev_targets;  // # iterations they _haven't_ been targets
-  bool check_targets();
-
-  double try_match(mds_rank_t ex, double& maxex,
-                   mds_rank_t im, double& maxim);
-  double get_maxim(mds_rank_t im) {
-    return target_load - mds_meta_load[im] - imported[im];
-  }
-  double get_maxex(mds_rank_t ex) {
-    return mds_meta_load[ex] - target_load - exported[ex];    
-  }
+  friend class C_Bal_SendHeartbeat;
 
 public:
   MDBalancer(MDSRank *m, Messenger *msgr, MonClient *monc) : 
@@ -88,39 +44,33 @@ public:
     mon_client(monc),
     beat_epoch(0),
     last_epoch_under(0), last_epoch_over(0), my_load(0.0), target_load(0.0) { }
-  
+
   mds_load_t get_load(utime_t);
 
   int proc_message(Message *m);
-  
-  int localize_balancer();
-  void send_heartbeat();
-  void handle_heartbeat(MHeartbeat *m);
 
+  /**
+   * Regularly called upkeep function.
+   *
+   * Sends MHeartbeat messages to the mons.
+   */
   void tick();
 
-  void export_empties();
-  //set up the rebalancing targets for export and do one if the
-  //MDSMap is up to date
-  void prep_rebalance(int beat);
-  int mantle_prep_rebalance();
-  /*check if the monitor has recorded the current export targets;
-    if it has then do the actual export. Otherwise send off our
-    export targets message again*/
+  /**
+   * Try to rebalance after receiving monitor mdsmap update.
+   *
+   * Check if the monitor has recorded the current export targets;
+   * if it has then do the actual export. Otherwise send off our
+   * export targets message again.
+   */
   void try_rebalance();
-  void find_exports(CDir *dir, 
-                    double amount, 
-                    list<CDir*>& exports, 
-                    double& have,
-                    set<CDir*>& already_exporting);
 
+  void subtract_export(CDir *ex, utime_t now);
+  void add_import(CDir *im, utime_t now);
 
-  void subtract_export(class CDir *ex, utime_t now);
-  void add_import(class CDir *im, utime_t now);
-
-  void hit_inode(utime_t now, class CInode *in, int type, int who=-1);
-  void hit_dir(utime_t now, class CDir *dir, int type, int who=-1, double amount=1.0);
-  void hit_recursive(utime_t now, class CDir *dir, int type, double amount, double rd_adj);
+  void hit_inode(utime_t now, CInode *in, int type, int who=-1);
+  void hit_dir(utime_t now, CDir *dir, int type, int who=-1, double amount=1.0);
+  void hit_recursive(utime_t now, CDir *dir, int type, double amount, double rd_adj);
 
   void queue_split(const CDir *dir, bool fast);
   void queue_merge(CDir *dir);
@@ -132,8 +82,65 @@ public:
    * \param hot whether the directory's temperature is enough to split it
    */
   void maybe_fragment(CDir *dir, bool hot);
-};
 
+private:
+  //set up the rebalancing targets for export and do one if the
+  //MDSMap is up to date
+  void prep_rebalance(int beat);
+  int mantle_prep_rebalance();
+
+  void export_empties();
+  int localize_balancer();
+  bool check_targets();
+  void send_heartbeat();
+  void handle_heartbeat(MHeartbeat *m);
+  void find_exports(CDir *dir,
+                    double amount,
+                    list<CDir*>& exports,
+                    double& have,
+                    set<CDir*>& already_exporting);
+
+  double try_match(mds_rank_t ex, double& maxex,
+                   mds_rank_t im, double& maxim);
+  double get_maxim(mds_rank_t im) {
+    return target_load - mds_meta_load[im] - imported[im];
+  }
+  double get_maxex(mds_rank_t ex) {
+    return mds_meta_load[ex] - target_load - exported[ex];
+  }
+
+  MDSRank *mds;
+  Messenger *messenger;
+  MonClient *mon_client;
+  int beat_epoch;
+
+  int last_epoch_under;
+  int last_epoch_over;
+  string bal_code;
+  string bal_version;
+
+  utime_t last_heartbeat;
+  utime_t last_sample;
+  utime_t rebalance_time; //ensure a consistent view of load for rebalance
+
+  // Dirfrags which are marked to be passed on to MDCache::[split|merge]_dir
+  // just as soon as a delayed context comes back and triggers it.
+  // These sets just prevent us from spawning extra timer contexts for
+  // dirfrags that already have one in flight.
+  set<dirfrag_t>   split_pending, merge_pending;
 
+  // per-epoch scatter/gathered info
+  map<mds_rank_t, mds_load_t>  mds_load;
+  map<mds_rank_t, double>       mds_meta_load;
+  map<mds_rank_t, map<mds_rank_t, float> > mds_import_map;
+
+  // per-epoch state
+  double          my_load, target_load;
+  map<mds_rank_t,double> my_targets;
+  map<mds_rank_t,double> imported;
+  map<mds_rank_t,double> exported;
+
+  map<mds_rank_t, int> old_prev_targets;  // # iterations they _haven't_ been targets
+};
 
 #endif