NIFI-10895 Handle minifi restarts more gracefully

Signed-off-by: Csaba Bejan <bejan.csaba@gmail.com> This closes #6852.
apache · Jan 16, 2023 · 2abb892 · 2abb892
1 parent b7071cb
commit 2abb892
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...rk/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java b/...rk/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java
@@ -305,11 +305,15 @@ private void acknowledgeHandler(String[] params) {
     }
 
     public void stop() {
+        bootstrapAcknowledgeExecutorService.shutdownNow();
+        heartbeatExecutorService.shutdown();
         try {
-            heartbeatExecutorService.shutdown();
-            heartbeatExecutorService.awaitTermination(TERMINATION_WAIT, TimeUnit.MILLISECONDS);
+            if (!heartbeatExecutorService.awaitTermination(TERMINATION_WAIT, TimeUnit.MILLISECONDS)) {
+                heartbeatExecutorService.shutdownNow();
+            }
         } catch (InterruptedException ignore) {
             LOGGER.info("Stopping C2 Client's thread was interrupted but shutting down anyway the C2NifiClientService");
+            heartbeatExecutorService.shutdownNow();
         }
     }