Merge pull request #67717 from leonidc/delay-failback

nvmeofgw: delay failback

diff --cc src/common/options/mon.yaml.in
Simple merge

diff --cc src/mon/NVMeofGwMap.cc
index 6cf45bcd7bfd8645649a1388d34d899d726491dc,2295673da6b0c9e551fc212e806b1a4212422eea..a98b294e2f7322af64dfb03e67262efd99b3b931
mode 100644,100755..100644
--- 1/src/mon/NVMeofGwMap.cc
--- 2/src/mon/NVMeofGwMap.cc
+++ b/src/mon/NVMeofGwMap.cc
@@@ -788,10 -527,15 +798,16 @@@ void NVMeofGwMap::handle_abandoned_ana_
                  gw_states_per_group_t::GW_STANDBY_STATE)) {
        // 2. Failback missed: Check this GW is Available and Standby and
        // no other GW is doing Failback to it
+ 
+   if (state.delay_failbacks_ts < now) {
        find_failback_gw(gw_id, group_key, propose);
+   } else {
+     dout(4) << "failback not allowed for GW "<< gw_id
+             << " failback delay  not expired yet" << dendl;
+   }
        }
      }
 +    check_relocate_ana_groups(group_key, propose);
      if (propose) {
        validate_gw_map(group_key);
        increment_gw_epoch(group_key);

diff --cc src/mon/NVMeofGwMon.cc
Simple merge

diff --cc src/mon/NVMeofGwTypes.h
index 01f9e2e33e780c21a860ccc4f6e8d8498129afbf,7febc9a960eac6b1756d3519a77dda8a4f634d7e..5e4ce53a9535b71f9ae8579d7416dc7ddc9b4e9b
mode 100644,100755..100644
--- 1/src/mon/NVMeofGwTypes.h
--- 2/src/mon/NVMeofGwTypes.h
+++ b/src/mon/NVMeofGwTypes.h