From 70adcbbc3afadec0b194ae1d7e9833d1c569bce9 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 30 May 2024 08:44:54 +0000 Subject: [PATCH] mon: validate SERVER_REEF on set-require-min-compat-client Unit testing ------------- ``` [rzarzynski@o06 build]$ bin/unittest_features ... [ RUN ] features.release_features 1 argonaut features 0x40000 looks like argonaut 2 bobtail features 0x40000 looks like argonaut 3 cuttlefish features 0x40000 looks like argonaut 4 dumpling features 0x42040000 looks like dumpling 5 emperor features 0x42040000 looks like dumpling 6 firefly features 0x20842040000 looks like firefly 7 giant features 0x20842040000 looks like firefly 8 hammer features 0x1020842040000 looks like hammer 9 infernalis features 0x1020842040000 looks like hammer 10 jewel features 0x401020842040000 looks like jewel 11 kraken features 0xc01020842040000 looks like kraken 12 luminous features 0xe01020842240000 looks like luminous 13 mimic features 0xe01020842240000 looks like luminous 14 nautilus features 0xe01020842240000 looks like luminous 15 octopus features 0xe01020842240000 looks like luminous 16 pacific features 0xe01020842240000 looks like luminous 17 quincy features 0xe01020842240000 looks like luminous 18 reef features 0xe010208d2240000 looks like reef 19 squid features 0xe010208d2240000 looks like reef [ OK ] features.release_features (0 ms) ``` Manual testing -------------- \### 'quincy` client connected to `main` cluster There was `ceph -w` from `quincy` running in the background. ``` [rzarzynski@o06 build]$ bin/ceph osd set-require-min-compat-client reef Error EPERM: cannot set require_min_compat_client to reef: 1 connected client(s) look like luminous (missing 0x80000000); add --yes-i-really-mean-it to do it anyway ``` \### Only `main` clients connected to `main` cluster ``` [rzarzynski@o06 build]$ bin/ceph osd get-require-min-compat-client luminous [rzarzynski@o06 build]$ bin/ceph daemon mon.a sessions | jq -jr '.[] | .name, "\t", .con_features, "\t", .con_features_hex, "\n"' | grep client client.? 4540701547738038271 3f03cffffffdffff client.? 4540701547738038271 3f03cffffffdffff [rzarzynski@o06 build]$ bin/ceph osd set-require-min-compat-client reef set require_min_compat_client to reef ``` Fixes: https://tracker.ceph.com/issues/61948 Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 4d74ff6327ebdc7deb44737cac08125204b2fec6) --- src/common/ceph_strings.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc index 18dcc701b31d5..a92311618973a 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; -- 2.39.5