nvmeofgw : beacon-diff cr changes 1

Signed-off-by: Leonid Chernin <leonidc@il.ibm.com>

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index b9ca2690abef3333b9cf8a6c0b5d9ea98736819b..9e51419e643d3af307626b8bfff87f468d794988 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -162,7 +162,6 @@ DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_PROXY_FEATURES, JEWEL, LUMINOUS) // overl
 DEFINE_CEPH_FEATURE(49, 2, SERVER_SQUID);
 DEFINE_CEPH_FEATURE_RETIRED(50, 1, MON_METADATA, MIMIC, OCTOPUS)
 DEFINE_CEPH_FEATURE(50, 2, SERVER_TENTACLE);
-DEFINE_CEPH_FEATURE_RETIRED(51, 1, OSD_BITWISE_HOBJ_SORT, MIMIC, OCTOPUS)
 DEFINE_CEPH_FEATURE(51, 2, NVMEOF_BEACON_DIFF)
 // available
 DEFINE_CEPH_FEATURE_RETIRED(52, 1, OSD_PROXY_WRITE_FEATURES, MIMIC, OCTOPUS)

diff --git a/src/mon/NVMeofGwMap.cc b/src/mon/NVMeofGwMap.cc
index b2202705a583431a1943a4c888003b7b6a086af6..964946cda3d2bc0ded76e834539c64f5f43990b3 100755 (executable)
--- a/src/mon/NVMeofGwMap.cc
+++ b/src/mon/NVMeofGwMap.cc
@@ -170,11 +170,8 @@ int NVMeofGwMap::cfg_add_gw(
 }
 
 int NVMeofGwMap::cfg_delete_gw(
-  const NvmeGwId &gw_id, const NvmeGroupKey& group_key, bool test)
+  const NvmeGwId &gw_id, const NvmeGroupKey& group_key)
 {
-  if (test)
-    return do_delete_gw(gw_id, group_key);
-
   if (HAVE_FEATURE(mon->get_quorum_con_features(), NVMEOFHA)) {
     dout(10) << " has NVMEOFHA: 1" << dendl;
     for (auto& gws_states: created_gws[group_key]) {

diff --git a/src/mon/NVMeofGwMap.h b/src/mon/NVMeofGwMap.h
index 0328b12611705e413b1ed5c553f5ec325179b702..0b675f7beaf400712c9aa4b41ab3c5fbff2ce3a4 100755 (executable)
--- a/src/mon/NVMeofGwMap.h
+++ b/src/mon/NVMeofGwMap.h
@@ -69,13 +69,12 @@ public:
     const NvmeGroupKey& group_key);
   int cfg_add_gw(const NvmeGwId &gw_id, const NvmeGroupKey& group_key,
     bool test = false);
-  int cfg_delete_gw(const NvmeGwId &gw_id, const NvmeGroupKey& group_key,
-    bool test = false);
+  int cfg_delete_gw(const NvmeGwId &gw_id, const NvmeGroupKey& group_key);
   void process_gw_map_ka(
     const NvmeGwId &gw_id, const NvmeGroupKey& group_key,
     epoch_t& last_osd_epoch,  bool &propose_pending);
   int process_gw_map_gw_down(
-    const NvmeGwId &gw_id, const Nv/meGroupKey& group_key,
+    const NvmeGwId &gw_id, const NvmeGroupKey& group_key,
     bool &propose_pending);
   int process_gw_map_gw_no_subsys_no_listeners(
     const NvmeGwId &gw_id, const NvmeGroupKey& group_key,

diff --git a/src/mon/NVMeofGwSerialize.h b/src/mon/NVMeofGwSerialize.h
index 244524c299c82a40dedf5db861311256b45f7aef..f9aabeb985dec39cc76106e24aa5b74d64f428cb 100755 (executable)
--- a/src/mon/NVMeofGwSerialize.h
+++ b/src/mon/NVMeofGwSerialize.h
@@ -337,12 +337,10 @@ inline  void decode(
   decode(state.gw_map_epoch, bl);
   decode(state.subsystems, bl);
   uint32_t avail;
-  uint64_t last_beacon_seq_number;
   decode(avail, bl);
   state.availability = (gw_availability_t)avail;
   if (struct_v >= 2) {
-    decode(last_beacon_seq_number, bl);
-    state.last_beacon_seq_number = last_beacon_seq_number;
+    decode(state.last_beacon_seq_number, bl);
     decode(state.last_beacon_seq_ooo, bl);
   }
   DECODE_FINISH(bl);