]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #62626 from aainscow/have_significant_feature
authorLaura Flores <lflores@redhat.com>
Thu, 10 Apr 2025 22:46:48 +0000 (17:46 -0500)
committerGitHub <noreply@github.com>
Thu, 10 Apr 2025 22:46:48 +0000 (17:46 -0500)
osd: Introduce macro to police use of significant features.

1  2 
src/osd/osd_types.cc

index 6068e6a1b1f9f985b68639f50e91afa4622663e4,605af0aec30888a63027e0a7ab935e86dc526f4d..6f8eacf3ee69bf18dc839c980950bcd830ea18b6
@@@ -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;