]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd_type: use SERVER_TENTACLE for fixing the pg_pool_t dencoding 62140/head
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 5 Mar 2025 16:51:13 +0000 (16:51 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 5 Mar 2025 16:51:15 +0000 (16:51 +0000)
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 <rzarzyns@redhat.com>
src/osd/osd_types.cc

index fbacb4e43eda5c4fb2a6dfc379a16ed51cb02c9a..7ad1a6472db037bdd1f5c21642db502f97be94e0 100644 (file)
@@ -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.