mds: move compat set methods to MDSMap

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

diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index 7993585a68f268e0328caf2dc0dc1413caa544ef..6ed027c071e4c09441b2b9c15eb6d2d0d2754d6b 100644 (file)
--- a/src/mds/Beacon.cc
+++ b/src/mds/Beacon.cc
@@ -245,7 +245,7 @@ void Beacon::_notify_mdsmap(MDSMap const *mdsmap)
 
   if (mdsmap->get_epoch() != epoch) {
     epoch = mdsmap->get_epoch();
-    compat = get_mdsmap_compat_set_default();
+    compat = MDSMap::get_compat_set_default();
     compat.merge(mdsmap->compat);
   }
 }

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index 10ef3fae65f47e3a6b53fb40508d1689ad68c23a..928da71a482290911fa734083b3a963e07c367e5 100644 (file)
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -470,7 +470,7 @@ void FSMap::decode(bufferlist::iterator& p)
     if (ev >= 3)
       decode(legacy_mds_map.compat, p);
     else
-      legacy_mds_map.compat = get_mdsmap_compat_set_base();
+      legacy_mds_map.compat = MDSMap::get_compat_set_base();
     if (ev < 5) {
       __u32 n;
       decode(n, p);

diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h
index 6450edecf1f108e9562a7c6b330804fd6b97b66e..ff87d3be652cbd21c1f1934e8963cbc653c99c2f 100644 (file)
--- a/src/mds/FSMap.h
+++ b/src/mds/FSMap.h
@@ -109,7 +109,7 @@ public:
     : epoch(0),
       next_filesystem_id(FS_CLUSTER_ID_ANONYMOUS + 1),
       legacy_client_fscid(FS_CLUSTER_ID_NONE),
-      compat(get_mdsmap_compat_set_default()),
+      compat(MDSMap::get_compat_set_default()),
       enable_multiple(false), ever_enabled_multiple(false)
   { }
 

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index 7c752919a2b7ab70eae568c76f54c3ac8db8d082..6954e991ab413396dcc9b7ea342764ba0e672e0c 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -912,7 +912,7 @@ void MDSDaemon::handle_mds_map(MMDSMap *m)
   mds_rank_t whoami = mdsmap->get_rank_gid(mds_gid_t(monc->get_global_id()));
 
   // verify compatset
-  CompatSet mdsmap_compat(get_mdsmap_compat_set_all());
+  CompatSet mdsmap_compat(MDSMap::get_compat_set_all());
   dout(10) << "     my compat " << mdsmap_compat << dendl;
   dout(10) << " mdsmap compat " << mdsmap->compat << dendl;
   if (!mdsmap_compat.writeable(mdsmap->compat)) {

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index b9b16d3e02d1eeb46e6f17327ef28cd6b62f032a..cd385cd74fa0d53cd2d9ab2d48056d93422300e0 100644 (file)
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -24,7 +24,7 @@ using std::stringstream;
 #define dout_subsys ceph_subsys_
 
 // features
-CompatSet get_mdsmap_compat_set_all() {
+CompatSet MDSMap::get_compat_set_all() {
   CompatSet::FeatureSet feature_compat;
   CompatSet::FeatureSet feature_ro_compat;
   CompatSet::FeatureSet feature_incompat;
@@ -42,7 +42,7 @@ CompatSet get_mdsmap_compat_set_all() {
   return CompatSet(feature_compat, feature_ro_compat, feature_incompat);
 }
 
-CompatSet get_mdsmap_compat_set_default() {
+CompatSet MDSMap::get_compat_set_default() {
   CompatSet::FeatureSet feature_compat;
   CompatSet::FeatureSet feature_ro_compat;
   CompatSet::FeatureSet feature_incompat;
@@ -60,7 +60,7 @@ CompatSet get_mdsmap_compat_set_default() {
 }
 
 // base (pre v0.20)
-CompatSet get_mdsmap_compat_set_base() {
+CompatSet MDSMap::get_compat_set_base() {
   CompatSet::FeatureSet feature_compat_base;
   CompatSet::FeatureSet feature_incompat_base;
   feature_incompat_base.insert(MDS_FEATURE_INCOMPAT_BASE);
@@ -201,7 +201,7 @@ void MDSMap::generate_test_instances(list<MDSMap*>& ls)
   m->data_pools.push_back(0);
   m->metadata_pool = 1;
   m->cas_pool = 2;
-  m->compat = get_mdsmap_compat_set_all();
+  m->compat = get_compat_set_all();
 
   // these aren't the defaults, just in case anybody gets confused
   m->session_timeout = 61;
@@ -748,7 +748,7 @@ void MDSMap::decode(bufferlist::iterator& p)
   if (ev >= 3)
     decode(compat, p);
   else
-    compat = get_mdsmap_compat_set_base();
+    compat = get_compat_set_base();
   if (ev < 5) {
     __u32 n;
     decode(n, p);

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 362f4b303e793af81334bc2d8e9cb3aaca6038eb..25cdc407e4fb9c09e1fefb3c598a8e992178ed4f 100644 (file)
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -62,10 +62,6 @@
 class CephContext;
 class health_check_map_t;
 
-extern CompatSet get_mdsmap_compat_set_all();
-extern CompatSet get_mdsmap_compat_set_default();
-extern CompatSet get_mdsmap_compat_set_base(); // pre v0.20
-
 #define MDS_FEATURE_INCOMPAT_BASE CompatSet::Feature(1, "base v0.20")
 #define MDS_FEATURE_INCOMPAT_CLIENTRANGES CompatSet::Feature(2, "client writeable ranges")
 #define MDS_FEATURE_INCOMPAT_FILELAYOUT CompatSet::Feature(3, "default file layouts on dirs")
@@ -168,6 +164,9 @@ public:
     void encode_unversioned(bufferlist& bl) const;
   };
 
+  static CompatSet get_compat_set_all();
+  static CompatSet get_compat_set_default();
+  static CompatSet get_compat_set_base(); // pre v0.20
 
 protected:
   // base map