commit c7503518b06d9a2cb295e27339fb63447d4a4a2f
author balaji.nagarajan <balaji.nagarajan@radisys.com> Wed Feb 04 09:47:43 2026 +0530
committer balaji.nagarajan <balaji.nagarajan@radisys.com> Thu Feb 05 12:47:57 2026 +0530
tree 3dc5c7cb35becff937dd98b1b1a07617a26c8229
parent fa561fc47bd52be2097146fa6f44d73bde29c9ae

[VOL-5565]:stop heartbeat routine before device cleanup

Change-Id: I3b2b8aa98374c46ef57b2320f6549f133a91085d
Signed-off-by: balaji.nagarajan <balaji.nagarajan@radisys.com>

VERSION

diff --git a/VERSION b/VERSION
index f07249b..7e07446 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.6.15
+4.6.16

internal/pkg/core/device_handler.go

diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 58bf3bd..ea6eedf 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -3145,6 +3145,12 @@
 	if dh.isReadIndicationRoutineActive {
 		dh.stopIndications <- true
 	}
+
+	// stop the heartbeat check routine
+	if dh.isHeartbeatCheckActive {
+		dh.stopHeartbeatCheck <- true
+	}
+
 	dh.lockDevice.RUnlock()
 
 	if err = dh.updateDeviceStateInCore(ctx, &ca.DeviceStateFilter{
@@ -3174,10 +3180,7 @@
 	if dh.isCollectorActive {
 		dh.stopCollector <- true
 	}
-	// stop the heartbeat check routine
-	if dh.isHeartbeatCheckActive {
-		dh.stopHeartbeatCheck <- true
-	}
+
 	dh.lockDevice.RUnlock()
 
 	dh.StopAllFlowRoutines(ctx)