Skip to content

Commit 5a0b785

Browse files
authored
Merge pull request ceph#57808 from rzarzynski/wip-bug-66297
mon: validate everybody understands MSR on set-require-min-compat-client Reviewed-by: Samuel Just <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]>
2 parents 16e05cf + 4b54b07 commit 5a0b785

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/common/ceph_strings.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,15 @@ uint64_t ceph_release_features(int r)
153153
return req;
154154

155155
req |= CEPH_FEATUREMASK_CRUSH_CHOOSE_ARGS; // and overlaps
156-
if (r <= CEPH_RELEASE_LUMINOUS)
156+
if (r <= CEPH_RELEASE_QUINCY)
157+
return req;
158+
159+
req |= CEPH_FEATUREMASK_SERVER_REEF; // upmap-primary
160+
if (r <= CEPH_RELEASE_REEF)
161+
return req;
162+
163+
req |= CEPH_FEATURE_CRUSH_MSR;
164+
if (r <= CEPH_RELEASE_SQUID)
157165
return req;
158166

159167
return req;

0 commit comments

Comments
 (0)