Merge pull request ceph#59240 from leonidc/wip-leonidc-20241508-upgrade-rules-centos9-only

upgrade rules for NVMeofGW monitors and gateways

Author: caroav

src/include/ceph_features.h

@@ -138,15 +138,13 @@ DEFINE_CEPH_FEATURE(35, 1, OSD_CACHEPOOL)    // 3.14
 DEFINE_CEPH_FEATURE(36, 1, CRUSH_V2)         // 3.14
 DEFINE_CEPH_FEATURE(37, 1, EXPORT_PEER)      // 3.14
 DEFINE_CEPH_FEATURE(38, 2, CRUSH_MSR)        // X.XX kernel version once in a release
-// available
 DEFINE_CEPH_FEATURE(39, 1, OSDMAP_ENC)       // 3.15
 DEFINE_CEPH_FEATURE(40, 1, MDS_INLINE_DATA)  // 3.19
 DEFINE_CEPH_FEATURE(41, 1, CRUSH_TUNABLES3)  // 3.15
 DEFINE_CEPH_FEATURE(41, 1, OSD_PRIMARY_AFFINITY) // overlap
 DEFINE_CEPH_FEATURE(42, 1, MSGR_KEEPALIVE2)  // 4.3 (for consistency)
 DEFINE_CEPH_FEATURE(43, 1, OSD_POOLRESEND)   // 4.13
-DEFINE_CEPH_FEATURE_RETIRED(44, 1, ERASURE_CODE_PLUGINS_V2, MIMIC, OCTOPUS)
-// available
+DEFINE_CEPH_FEATURE(44, 2, NVMEOFHA)
 DEFINE_CEPH_FEATURE_RETIRED(45, 1, OSD_SET_ALLOC_HINT, JEWEL, LUMINOUS)
 // available
 DEFINE_CEPH_FEATURE(46, 1, OSD_FADVISE_FLAGS)
@@ -225,6 +223,7 @@ DEFINE_CEPH_FEATURE_RETIRED(63, 1, RESERVED_BROKEN, LUMINOUS, QUINCY) // client-
 	 CEPH_FEATURE_OSD_PRIMARY_AFFINITY |	\
 	 CEPH_FEATURE_MSGR_KEEPALIVE2 |	\
 	 CEPH_FEATURE_OSD_POOLRESEND |	\
+	 CEPH_FEATUREMASK_NVMEOFHA | \
 	 CEPH_FEATURE_OSD_FADVISE_FLAGS |     \
 	 CEPH_FEATURE_MDS_QUOTA | \
          CEPH_FEATURE_CRUSH_V4 |	     \

src/messages/MNVMeofGwMap.h

@@ -56,7 +56,7 @@ class MNVMeofGwMap final : public Message {
     using ceph::encode;
     encode(VERSION, payload);
     encode(gwmap_epoch, payload);
-    encode(map, payload);
+    encode(map, payload, features);
   }
 private:
   using RefCountedObject::put;

src/mon/NVMeofGwMap.cc

@@ -83,6 +83,12 @@ int NVMeofGwMap::cfg_add_gw(
       return -EEXIST ;
     }
   }
+  if (allocated.size() == MAX_SUPPORTED_ANA_GROUPS) {
+    dout(4) << "Warning:  cannot add GW " << gw_id
+         << " since number GWs in the group is "
+         <<  MAX_SUPPORTED_ANA_GROUPS << dendl;
+    return -EINVAL;
+  }
   // Allocate the new group id
   NvmeAnaGrpId i = 0;
   bool was_allocated = false;

src/mon/NVMeofGwMap.h

@@ -106,13 +106,13 @@ class NVMeofGwMap
     const NvmeGwId &gw_id, const NvmeGroupKey& group_key,
     NvmeAnaGrpId ANA_groupid, epoch_t &epoch, bool failover);
 
-  void encode(ceph::buffer::list &bl) const {
+  void encode(ceph::buffer::list &bl, uint64_t features) const {
     using ceph::encode;
     ENCODE_START(1, 1, bl);
     encode(epoch, bl);// global map epoch
 
-    encode(created_gws, bl); //Encode created GWs
-    encode(fsm_timers, bl);
+    encode(created_gws, bl, features); //Encode created GWs
+    encode(fsm_timers, bl, features);
     ENCODE_FINISH(bl);
   }
 

src/mon/NVMeofGwMon.cc

@@ -158,7 +158,10 @@ void NVMeofGwMon::encode_pending(MonitorDBStore::TransactionRef t)
   dout(10) << dendl;
   ceph_assert(get_last_committed() + 1 == pending_map.epoch);
   bufferlist bl;
-  pending_map.encode(bl);
+  uint64_t features = mon.get_quorum_con_features();
+  pending_map.encode(bl, features);
+  dout(10) << " has NVMEOFHA: "
+	   << HAVE_FEATURE(mon.get_quorum_con_features(), NVMEOFHA) << dendl;
   put_version(t, pending_map.epoch, bl);
   put_last_committed(t, pending_map.epoch);
 }