From: Laura Flores <lflores@redhat.com>
Date: Thu, 10 Apr 2025 22:46:48 +0000 (-0500)
Subject: Merge pull request #62626 from aainscow/have_significant_feature
X-Git-Tag: testing/wip-vshankar-testing-20250411.090237-debug~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=563ff040d80f4f50db16f4d1b759478a8932ee0c;p=ceph-ci.git

Merge pull request #62626 from aainscow/have_significant_feature

osd: Introduce macro to police use of significant features.
---

563ff040d80f4f50db16f4d1b759478a8932ee0c
diff --cc src/osd/osd_types.cc
index 6068e6a1b1f,605af0aec30..6f8eacf3ee6
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@@ -1962,11 -1961,11 +1962,11 @@@ void pg_pool_t::encode(ceph::buffer::li
      return;
    }
  
 -  uint8_t v = 31;
 +  uint8_t v = 32;
    // NOTE: any new encoding dependencies must be reflected by
    // SIGNIFICANT_FEATURES
-   if (!HAVE_FEATURE(features, SERVER_TENTACLE)) {
-     if (!(features & CEPH_FEATURE_NEW_OSDOP_ENCODING)) {
+   if (!HAVE_SIGNIFICANT_FEATURE(features, SERVER_TENTACLE)) {
+     if (!HAVE_SIGNIFICANT_FEATURE(features, NEW_OSDOP_ENCODING)) {
        // this was the first post-hammer thing we added; if it's missing, encode
        // like hammer.
        v = 21;