From d879e0d640a1bc6c4de2ea3a4ad2666a00b18e29 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Wed, 31 Dec 2014 08:07:40 -0500 Subject: [PATCH] NIFI-215: Shut down the ProcessScheduler that is used for Reporting Tasks when NCM is stopped --- .../apache/nifi/cluster/manager/impl/WebClusterManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java index 3defea75e0..511bb7d7fb 100644 --- a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java +++ b/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java @@ -512,6 +512,10 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C servicesBroadcaster.stop(); } + if ( processScheduler != null ) { + processScheduler.shutdown(); + } + if (encounteredException) { throw new IOException("Failed to shutdown Cluster Manager because one or more cluster services failed to shutdown. Check the logs for details."); }