mon/NVMeofGw*: support upgrades from prior out-of-tree nvmeofha implementation (nvmeof-reef)

This commit adds upgrade support for users running an experimental
nvmeofha implementation which can be found in the nvmeof-reef branch in
ceph.git.

Signed-off-by: Leonid Chernin <[email protected]>

Author: leonidc

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);
 }