Browse Source

Restore interrupt flag in awaitConsumerTermination

pull/14618/head
Nikita Mazurenko 7 months ago
parent
commit
4e32c6490a
  1. 3
      application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java

3
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(); EdgeSessionState state = getState();
try { try {
if (!consumerExecutor.awaitTermination(10, java.util.concurrent.TimeUnit.SECONDS)) { if (!consumerExecutor.awaitTermination(10, java.util.concurrent.TimeUnit.SECONDS)) {
consumerExecutor.shutdownNow(); // todo: verify it is acceptable consumerExecutor.shutdownNow();
} }
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
log.warn("[{}][{}] Interrupted while awaiting consumer executor termination", state.getTenantId(), state.getEdgeId()); log.warn("[{}][{}] Interrupted while awaiting consumer executor termination", state.getTenantId(), state.getEdgeId());
Thread.currentThread().interrupt();
} }
} }
} }

Loading…
Cancel
Save