From: Leonid Chernin <leonidc@il.ibm.com>
Date: Wed, 12 Feb 2025 16:17:49 +0000 (+0200)
Subject: cancel Blocklist_cmpl timer when expired
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39ff65c8383b36ae4c2e2b445afce6deb3d4bbb5;p=ceph-ci.git

cancel Blocklist_cmpl timer when expired
Resolves: rhbz#2345170

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

diff --git a/src/mon/NVMeofGwMap.cc b/src/mon/NVMeofGwMap.cc
index 068258289af..220014c54e6 100755
--- a/src/mon/NVMeofGwMap.cc
+++ b/src/mon/NVMeofGwMap.cc
@@ -851,6 +851,8 @@ void NVMeofGwMap::fsm_handle_to_expired(
 	    << "from GW, Force exit the GW " << gw_id
 	    << " ANA groupId: "<< grpid << dendl;
     fbp_gw_state.set_unavailable_state();
+    fbp_gw_state.sm_state[grpid] = gw_states_per_group_t::GW_STANDBY_STATE;
+    cancel_timer(gw_id, group_key, grpid);
     map_modified = true;
   }
   if (map_modified) validate_gw_map(group_key);