From: leonidc <leonidc@il.ibm.com>
Date: Tue, 2 Jun 2026 08:03:36 +0000 (+0300)
Subject: Merge pull request #67717 from leonidc/delay-failback
X-Git-Tag: v21.0.1~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa512a85e1065de9c9df60b144979d82c0dc8627;p=ceph.git

Merge pull request #67717 from leonidc/delay-failback

nvmeofgw: delay failback
---

fa512a85e1065de9c9df60b144979d82c0dc8627
diff --cc src/mon/NVMeofGwMap.cc
index 6cf45bcd7bf,2295673da6b..a98b294e2f7
mode 100644,100755..100644
--- a/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/NVMeofGwTypes.h
index 01f9e2e33e7,7febc9a960e..5e4ce53a953
mode 100644,100755..100644
--- a/src/mon/NVMeofGwTypes.h
+++ b/src/mon/NVMeofGwTypes.h