From f2b3bc810a194276bbe8583b33d9cf06c5bc41fb Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 5 Mar 2025 16:51:13 +0000 Subject: [PATCH] osd_type: use SERVER_TENTACLE for fixing the pg_pool_t dencoding The Nitzan's fix has made into Squid, so just replace `SERVET_SQUID` with `SERVER_TENTACLE`. The commit was never exposed, so it should be perfectly fine to just bump up. Doing this in separate commit to keep the boundaries between changes from 2 authors. Fixes: https://tracker.ceph.com/issues/59291 Signed-off-by: Radoslaw Zarzynski --- src/osd/osd_types.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index fbacb4e43eda..7ad1a6472db0 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -1955,7 +1955,7 @@ void pg_pool_t::encode(ceph::buffer::list& bl, uint64_t features) const uint8_t v = 31; // NOTE: any new encoding dependencies must be reflected by // SIGNIFICANT_FEATURES - if (!HAVE_FEATURE(features, SERVER_SQUID)) { + if (!HAVE_FEATURE(features, SERVER_TENTACLE)) { if (!(features & CEPH_FEATURE_NEW_OSDOP_ENCODING)) { // this was the first post-hammer thing we added; if it's missing, encode // like hammer. -- 2.47.3