From 07db50e0575aea924fc0cf42d03b1995afa87188 Mon Sep 17 00:00:00 2001
From: root <varao@redhat.com>
Date: Wed, 25 Sep 2019 11:07:59 +0530
Subject: [PATCH] mds: Reorganize class members in MDBalancer header

Fixes: https://tracker.ceph.com/issues/42043
Signed-off-by: Varsha Rao <varao@redhat.com>
---
 src/mds/MDBalancer.h | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index 18661f7bed7..c6d85a5aed6 100644
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -11,15 +11,9 @@
  * Foundation.  See file COPYING.
  * 
  */
-
-
-
 #ifndef CEPH_MDBALANCER_H
 #define CEPH_MDBALANCER_H
 
-#include <list>
-#include <map>
-
 #include "include/types.h"
 #include "common/Clock.h"
 #include "common/Cond.h"
@@ -78,10 +72,6 @@ public:
   int dump_loads(Formatter *f) const;
 
 private:
-  bool bal_fragment_dirs;
-  int64_t bal_fragment_interval;
-  static const unsigned int AUTH_TREES_THRESHOLD = 5;
-
   typedef struct {
     std::map<mds_rank_t, double> targets;
     std::map<mds_rank_t, double> imported;
@@ -125,6 +115,10 @@ private:
    */
   void try_rebalance(balance_state_t& state);
 
+  bool bal_fragment_dirs;
+  int64_t bal_fragment_interval;
+  static const unsigned int AUTH_TREES_THRESHOLD = 5;
+
   MDSRank *mds;
   Messenger *messenger;
   MonClient *mon_client;
@@ -145,11 +139,11 @@ private:
   // 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;
+  set<dirfrag_t> split_pending, merge_pending;
 
   // per-epoch scatter/gathered info
-  std::map<mds_rank_t, mds_load_t>  mds_load;
-  std::map<mds_rank_t, double>       mds_meta_load;
+  std::map<mds_rank_t, mds_load_t> mds_load;
+  std::map<mds_rank_t, double> mds_meta_load;
   std::map<mds_rank_t, map<mds_rank_t, float> > mds_import_map;
   std::map<mds_rank_t, int> mds_last_epoch_under_map;
 
@@ -157,5 +151,4 @@ private:
   double my_load = 0;
   double target_load = 0;
 };
-
 #endif
-- 
2.39.5