From 4e32c6490a2028e2e148c3018e1d9e9899fcbaf0 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Wed, 18 Mar 2026 11:30:44 +0200
Subject: [PATCH] Restore interrupt flag in awaitConsumerTermination

---
 .../rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java
index d688f1df4a..ebc5531320 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java
@@ -292,10 +292,11 @@ public class KafkaBasedEdgeGrpcSessionManager extends AbstractEdgeGrpcSessionMan
         EdgeSessionState state = getState();
         try {
             if (!consumerExecutor.awaitTermination(10, java.util.concurrent.TimeUnit.SECONDS)) {
-                consumerExecutor.shutdownNow(); // todo: verify it is acceptable
+                consumerExecutor.shutdownNow();
             }
         } catch (InterruptedException ie) {
             log.warn("[{}][{}] Interrupted while awaiting consumer executor termination", state.getTenantId(), state.getEdgeId());
+            Thread.currentThread().interrupt();
         }
     }
 }