summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/ceph_strings.cc6
-rw-r--r--src/common/options/mds-client.yaml.in8
2 files changed, 13 insertions, 1 deletions
diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index 18dcc701b..a92311618 100644
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -151,7 +151,11 @@ uint64_t ceph_release_features(int r)
return req;
req |= CEPH_FEATUREMASK_CRUSH_CHOOSE_ARGS; // and overlaps
- if (r <= CEPH_RELEASE_LUMINOUS)
+ if (r <= CEPH_RELEASE_QUINCY)
+ return req;
+
+ req |= CEPH_FEATUREMASK_SERVER_REEF; // upmap-primary
+ if (r <= CEPH_RELEASE_REEF)
return req;
return req;
diff --git a/src/common/options/mds-client.yaml.in b/src/common/options/mds-client.yaml.in
index 1f7600dee..28912cdb1 100644
--- a/src/common/options/mds-client.yaml.in
+++ b/src/common/options/mds-client.yaml.in
@@ -251,6 +251,14 @@ options:
default: 0
services:
- mds_client
+- name: client_debug_inject_features
+ type: str
+ level: dev
+ services:
+ - mds_client
+ flags:
+ - startup
+ with_legacy: true
- name: client_max_inline_size
type: size
level: dev