From ccdb6f85f787c7ca7d7b52d712b92071d660544e Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 5 May 2018 19:54:27 -0700 Subject: [PATCH] mds: refactor FSMap init Signed-off-by: Patrick Donnelly (cherry picked from commit 344be27d696f8f7f9522f75c8aae55a2b62cdd7c) --- src/mds/FSMap.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h index 1712ad94ac3b3..5eaf1c320fe72 100644 --- a/src/mds/FSMap.h +++ b/src/mds/FSMap.h @@ -77,12 +77,12 @@ WRITE_CLASS_ENCODER_FEATURES(Filesystem) class FSMap { protected: - epoch_t epoch; - uint64_t next_filesystem_id; - fs_cluster_id_t legacy_client_fscid; + epoch_t epoch = 0; + uint64_t next_filesystem_id = FS_CLUSTER_ID_ANONYMOUS + 1; + fs_cluster_id_t legacy_client_fscid = FS_CLUSTER_ID_NONE; CompatSet compat; - bool enable_multiple; - bool ever_enabled_multiple; // < the cluster had multiple MDSes enabled once + bool enable_multiple = false; + bool ever_enabled_multiple = false; // < the cluster had multiple MDSes enabled once std::map > filesystems; @@ -99,13 +99,7 @@ public: friend class MDSMonitor; friend class PaxosFSMap; - FSMap() - : epoch(0), - next_filesystem_id(FS_CLUSTER_ID_ANONYMOUS + 1), - legacy_client_fscid(FS_CLUSTER_ID_NONE), - compat(MDSMap::get_compat_set_default()), - enable_multiple(false), ever_enabled_multiple(false) - { } + FSMap() : compat(MDSMap::get_compat_set_default()) {} FSMap(const FSMap &rhs) : -- 2.39.5