diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-21 02:27:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-21 02:27:49 +0000 |
| commit | 7a34f7a30b4a4e8efeac9ba420466271ccbd41ef (patch) | |
| tree | 9dd853fa51de7b429a5e7aa64a2f640d30506378 /src/osd/OSDMap.cc | |
| parent | Releasing progress-linux version 18.2.3-0progress7.99u1. (diff) | |
| download | ceph-7a34f7a30b4a4e8efeac9ba420466271ccbd41ef.tar.xz ceph-7a34f7a30b4a4e8efeac9ba420466271ccbd41ef.zip | |
Merging upstream version 18.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/osd/OSDMap.cc')
| -rw-r--r-- | src/osd/OSDMap.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 5fb73084d..6468e605c 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1747,9 +1747,12 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const } mask |= CEPH_FEATURES_CRUSH; - if (!pg_upmap.empty() || !pg_upmap_items.empty() || !pg_upmap_primaries.empty()) + if (!pg_upmap.empty() || !pg_upmap_items.empty()) features |= CEPH_FEATUREMASK_OSDMAP_PG_UPMAP; mask |= CEPH_FEATUREMASK_OSDMAP_PG_UPMAP; + if (!pg_upmap_primaries.empty()) + features |= CEPH_FEATUREMASK_SERVER_REEF; + mask |= CEPH_FEATUREMASK_SERVER_REEF; for (auto &pool: pools) { if (pool.second.has_flag(pg_pool_t::FLAG_HASHPSPOOL)) { @@ -1821,6 +1824,9 @@ ceph_release_t OSDMap::get_min_compat_client() const { uint64_t f = get_features(CEPH_ENTITY_TYPE_CLIENT, nullptr); + if (HAVE_FEATURE(f, SERVER_REEF)) { // v18.2.3 (upmap-primary; see #61948) + return ceph_release_t::reef; + } if (HAVE_FEATURE(f, OSDMAP_PG_UPMAP) || // v12.0.0-1733-g27d6f43 HAVE_FEATURE(f, CRUSH_CHOOSE_ARGS)) { // v12.0.1-2172-gef1ef28 return ceph_release_t::luminous; // v12.2.0 |