mds: simplify beacon init

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b7448f8fe0e4d12dd1070de4c3380e21d9da310a)

Conflicts:
	src/mds/Beacon.cc
	src/mds/Beacon.h

diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index e64549bd762501d711b6fbd80bb21e092bae1bf9..159237899be9ba33502302a99b7b303176203c9a 100644 (file)
--- a/src/mds/Beacon.cc
+++ b/src/mds/Beacon.cc
@@ -36,23 +36,11 @@
 
 Beacon::Beacon(CephContext *cct_, MonClient *monc_, boost::string_view name_) :
   Dispatcher(cct_), lock("Beacon"), monc(monc_), timer(g_ceph_context, lock),
-  name(name_), standby_for_rank(MDS_RANK_NONE),
-  standby_for_fscid(FS_CLUSTER_ID_NONE), want_state(MDSMap::STATE_BOOT),
-  awaiting_seq(-1)
-{
-  last_seq = 0;
-  was_laggy = false;
-
-  epoch = 0;
-}
-
-
-Beacon::~Beacon()
+  name(name_)
 {
 }
 
-
-void Beacon::init(MDSMap const *mdsmap)
+void Beacon::init(const MDSMap* mdsmap)
 {
   Mutex::Locker l(lock);
   assert(mdsmap != NULL);

diff --git a/src/mds/Beacon.h b/src/mds/Beacon.h
index 42dbfdcd1e7e5d87850202b0cc305e189e76e996..41489928a76d1a0ffff6689d692b776ce729712b 100644 (file)
--- a/src/mds/Beacon.h
+++ b/src/mds/Beacon.h
@@ -43,7 +43,7 @@ class Beacon : public Dispatcher
 {
 public:
   Beacon(CephContext *cct_, MonClient *monc_, boost::string_view name);
-  ~Beacon() override;
+  ~Beacon() override {};
 
   void init(MDSMap const *mdsmap);
   void shutdown();
@@ -87,20 +87,20 @@ private:
 
   // Items we duplicate from the MDS to have access under our own lock
   std::string name;
-  version_t epoch;
+  version_t epoch = 0;
   CompatSet compat;
-  mds_rank_t standby_for_rank;
+  mds_rank_t standby_for_rank = MDS_RANK_NONE;
   std::string standby_for_name;
-  fs_cluster_id_t standby_for_fscid;
-  bool standby_replay;
-  MDSMap::DaemonState want_state;
+  fs_cluster_id_t standby_for_fscid = FS_CLUSTER_ID_NONE;
+  bool standby_replay = false;
+  MDSMap::DaemonState want_state = MDSMap::STATE_BOOT;
 
   // Internal beacon state
-  version_t last_seq;          // last seq sent to monitor
+  version_t last_seq = 0; // last seq sent to monitor
   std::map<version_t,utime_t>  seq_stamp;    // seq # -> time sent
   utime_t last_acked_stamp;  // last time we sent a beacon that got acked
   utime_t last_mon_reconnect;
-  bool was_laggy;
+  bool was_laggy = false;
   utime_t laggy_until;
 
   // Health status to be copied into each beacon message
@@ -109,7 +109,7 @@ private:
   // Ticker
   Context *sender = nullptr;
 
-  version_t awaiting_seq;
+  version_t awaiting_seq = -1;
   Cond waiting_cond;
 };