[nifi] branch master updated: NIFI-5940 Cluster Node Offload Hangs if any RPG on flow is Disabled

[markap14]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 35147a6  NIFI-5940 Cluster Node Offload Hangs if any RPG on flow is 
Disabled
35147a6 is described below

commit 35147a620f2ae4e2164ba342e77976667837d5f3
Author: Peter Wicks <patric...@gmail.com>
AuthorDate: Wed Jan 9 13:03:46 2019 -0700

    NIFI-5940 Cluster Node Offload Hangs if any RPG on flow is Disabled
    
    This closes #3255
    
    Signed-off-by: Mark Payne <marka...@hotmail.com>
---
 .../src/main/java/org/apache/nifi/controller/StandardFlowService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
index 83d845c..ef50439 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
@@ -710,7 +710,9 @@ public class StandardFlowService implements FlowService, 
ProtocolHandler {
                     .forEach(pn -> 
pn.getProcessGroup().terminateProcessor(pn));
 
             // request to stop all remote process groups
-            
flowManager.getRootGroup().findAllRemoteProcessGroups().forEach(RemoteProcessGroup::stopTransmitting);
+            flowManager.getRootGroup().findAllRemoteProcessGroups()
+                    .stream().filter(rpg -> rpg.isTransmitting())
+                    .forEach(RemoteProcessGroup::stopTransmitting);
 
             // offload all queues on node
             final Set<Connection> connections = 
flowManager.findAllConnections();