You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/07/20 16:05:32 UTC

nifi git commit: NIFI-2319: Ensure that when we set cluster node id's and node addresses, that we do so only if they are not already populated

Repository: nifi
Updated Branches:
  refs/heads/master 108c81598 -> 2a7f135f1


NIFI-2319: Ensure that when we set cluster node id's and node addresses, that we do so only if they are not already populated

This closes #680

Signed-off-by: jpercivall <jo...@yahoo.com>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2a7f135f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2a7f135f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2a7f135f

Branch: refs/heads/master
Commit: 2a7f135f1c8c9a31b1084860419383f4196e386c
Parents: 108c815
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Jul 19 15:33:59 2016 -0400
Committer: jpercivall <jo...@yahoo.com>
Committed: Wed Jul 20 11:39:57 2016 -0400

----------------------------------------------------------------------
 .../http/endpoints/ComponentStateEndpointMerger.java     |  7 +++++--
 .../http/endpoints/ListFlowFilesEndpointMerger.java      |  6 ++++--
 .../http/endpoints/ProvenanceEventEndpointMerger.java    | 11 ++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/2a7f135f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ComponentStateEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ComponentStateEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ComponentStateEndpointMerger.java
index 5ab71c9..3b03ed0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ComponentStateEndpointMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ComponentStateEndpointMerger.java
@@ -74,8 +74,11 @@ public class ComponentStateEndpointMerger extends AbstractSingleDTOEndpoint<Comp
                 totalStateEntries += nodeLocalStateMap.getTotalEntryCount();
 
                 for (final StateEntryDTO nodeStateEntry : nodeLocalStateMap.getState()) {
-                    nodeStateEntry.setClusterNodeId(nodeId.getId());
-                    nodeStateEntry.setClusterNodeAddress(nodeAddress);
+                    if (nodeStateEntry.getClusterNodeId() == null || nodeStateEntry.getClusterNodeAddress() == null) {
+                        nodeStateEntry.setClusterNodeId(nodeId.getId());
+                        nodeStateEntry.setClusterNodeAddress(nodeAddress);
+                    }
+
                     localStateEntries.add(nodeStateEntry);
                 }
             }

http://git-wip-us.apache.org/repos/asf/nifi/blob/2a7f135f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ListFlowFilesEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ListFlowFilesEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ListFlowFilesEndpointMerger.java
index 2d17c49..72d42e2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ListFlowFilesEndpointMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ListFlowFilesEndpointMerger.java
@@ -124,8 +124,10 @@ public class ListFlowFilesEndpointMerger extends AbstractSingleDTOEndpoint<Listi
 
             if (nodeRequest.getFlowFileSummaries() != null) {
                 for (final FlowFileSummaryDTO summaryDTO : nodeRequest.getFlowFileSummaries()) {
-                    summaryDTO.setClusterNodeId(nodeIdentifier.getId());
-                    summaryDTO.setClusterNodeAddress(nodeAddress);
+                    if (summaryDTO.getClusterNodeId() == null || summaryDTO.getClusterNodeAddress() == null) {
+                        summaryDTO.setClusterNodeId(nodeIdentifier.getId());
+                        summaryDTO.setClusterNodeAddress(nodeAddress);
+                    }
 
                     flowFileSummaries.add(summaryDTO);
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/2a7f135f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceEventEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceEventEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceEventEndpointMerger.java
index c05ca7f..e0372c0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceEventEndpointMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceEventEndpointMerger.java
@@ -48,8 +48,13 @@ public class ProvenanceEventEndpointMerger extends AbstractSingleDTOEndpoint<Pro
     @Override
     protected void mergeResponses(ProvenanceEventDTO clientDto, Map<NodeIdentifier, ProvenanceEventDTO> dtoMap, Set<NodeResponse> successfulResponses, Set<NodeResponse> problematicResponses) {
         // The request for a Provenance Event is replicated to a single Node. We simply update its cluster node info.
-        final NodeIdentifier nodeId = successfulResponses.iterator().next().getNodeId();
-        clientDto.setClusterNodeId(nodeId.getId());
-        clientDto.setClusterNodeAddress(nodeId.getApiAddress() + ":" + nodeId.getApiPort());
+        // However, we only do this if the cluster node info isn't set, because if this is replicated across the cluster,
+        // the cluster coordinator will have already set it, and we will be receiving the response from the cluster
+        // coordinator. We do not want to overwrite this value on all DTO's with the cluster coordinator's information.
+        if (clientDto.getClusterNodeId() == null || clientDto.getClusterNodeAddress() == null) {
+            final NodeIdentifier nodeId = successfulResponses.iterator().next().getNodeId();
+            clientDto.setClusterNodeId(nodeId.getId());
+            clientDto.setClusterNodeAddress(nodeId.getApiAddress() + ":" + nodeId.getApiPort());
+        }
     }
 }