From 838bd091b5c88c7d3570894d69c706186635bb63 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Tue, 31 Oct 2017 18:29:09 +0800 Subject: [PATCH] mds: add incompat feature and bump protocol for snapshot changes Signed-off-by: "Yan, Zheng" --- src/mds/MDSDaemon.h | 2 +- src/mds/MDSMap.cc | 2 ++ src/mds/MDSMap.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mds/MDSDaemon.h b/src/mds/MDSDaemon.h index 29a273afadc..27a8a422631 100644 --- a/src/mds/MDSDaemon.h +++ b/src/mds/MDSDaemon.h @@ -29,7 +29,7 @@ #include "MDSMap.h" #include "MDSRank.h" -#define CEPH_MDS_PROTOCOL 31 /* cluster internal */ +#define CEPH_MDS_PROTOCOL 32 /* cluster internal */ class AuthAuthorizeHandlerRegistry; class Message; diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index feb3e7d831c..186650e3b73 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -37,6 +37,7 @@ CompatSet get_mdsmap_compat_set_all() { feature_incompat.insert(MDS_FEATURE_INCOMPAT_INLINE); feature_incompat.insert(MDS_FEATURE_INCOMPAT_NOANCHOR); feature_incompat.insert(MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2); + feature_incompat.insert(MDS_FEATURE_INCOMPAT_SNAPREALM_V2); return CompatSet(feature_compat, feature_ro_compat, feature_incompat); } @@ -53,6 +54,7 @@ CompatSet get_mdsmap_compat_set_default() { feature_incompat.insert(MDS_FEATURE_INCOMPAT_OMAPDIRFRAG); feature_incompat.insert(MDS_FEATURE_INCOMPAT_NOANCHOR); feature_incompat.insert(MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2); + feature_incompat.insert(MDS_FEATURE_INCOMPAT_SNAPREALM_V2); return CompatSet(feature_compat, feature_ro_compat, feature_incompat); } diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h index e46cbb05ad4..1d083bd5597 100644 --- a/src/mds/MDSMap.h +++ b/src/mds/MDSMap.h @@ -75,6 +75,7 @@ extern CompatSet get_mdsmap_compat_set_base(); // pre v0.20 #define MDS_FEATURE_INCOMPAT_INLINE CompatSet::Feature(7, "mds uses inline data") #define MDS_FEATURE_INCOMPAT_NOANCHOR CompatSet::Feature(8, "no anchor table") #define MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2 CompatSet::Feature(9, "file layout v2") +#define MDS_FEATURE_INCOMPAT_SNAPREALM_V2 CompatSet::Feature(10, "snaprealm v2") #define MDS_FS_NAME_DEFAULT "cephfs" -- 2.39.5