Merge branch 'tentacle' into wip-74692-tentacle

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

diff --cc src/mon/NVMeofGwMon.cc
index 687cc450db316fa1dd68f7013b8b86f9b558cfcf,84becd7d1da3bc4205685e9b8ab0ba92f47b2edb..3c80fcec84eff34aff551951abed0a3f969478ba
--- 1/src/mon/NVMeofGwMon.cc
--- 2/src/mon/NVMeofGwMon.cc
+++ b/src/mon/NVMeofGwMon.cc
@@@ -683,9 -846,8 +855,9 @@@ bool NVMeofGwMon::prepare_beacon(MonOpR
    bool apply_ack_logic = true;
    bool send_ack =  false;
  
 +  check_beacon_timeout(now, gw_propose);
    if (avail == gw_availability_t::GW_CREATED) {
-     if (gw == group_gws.end()) {
+     if (!gw_exists) {
        gw_created = false;
        dout(10) << "Warning: GW " << gw_id << " group_key " << group_key
               << " was not found in the  map.created_gws "

diff --cc src/mon/NVMeofGwMon.h
index 16ca9e568fcfb70f856f34d7eb26b212940480c0,7055b7d14f335166df11cb883646350c758ab5e6..e75b00e19505ae1652f24b2046a52a9334dac4b7
--- 1/src/mon/NVMeofGwMon.h
--- 2/src/mon/NVMeofGwMon.h
+++ b/src/mon/NVMeofGwMon.h
@@@ -107,8 -107,6 +107,9 @@@ private
    void do_send_map_ack(MonOpRequestRef op, bool gw_created, bool gw_propose,
         uint64_t stored_sequence, bool is_correct_sequence,
         const NvmeGroupKey& group_key, const NvmeGwId &gw_id);
 +  void check_beacon_timeout(ceph::coarse_mono_clock::time_point now,
 +       bool &propose_pending);
++
  };
  
  #endif /* MON_NVMEGWMONITOR_H_ */