You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ym...@apache.org on 2016/09/27 16:01:49 UTC
[1/2] nifi git commit: NIFI-2824: - Updating replication logic to
account for the potential replication target and then invoking the
corresponding action.
Repository: nifi
Updated Branches:
refs/heads/master 3ac3b8dc9 -> de717da73
NIFI-2824: - Updating replication logic to account for the potential replication target and then invoking the corresponding action.
Signed-off-by: Yolanda M. Davis <ym...@apache.org>
This closes #1068
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/dd9ecc29
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dd9ecc29
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dd9ecc29
Branch: refs/heads/master
Commit: dd9ecc2907acc6d186fc000e3ab00d241bd1b296
Parents: 508b218
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Sep 26 16:03:07 2016 -0400
Committer: Yolanda M. Davis <ym...@apache.org>
Committed: Tue Sep 27 11:44:21 2016 -0400
----------------------------------------------------------------------
.../web/StandardNiFiWebConfigurationContext.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/dd9ecc29/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
index 021f216..fb38ce9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
@@ -49,6 +49,7 @@ import org.apache.nifi.controller.reporting.ReportingTaskProvider;
import org.apache.nifi.controller.service.ControllerServiceProvider;
import org.apache.nifi.registry.VariableRegistry;
import org.apache.nifi.util.NiFiProperties;
+import org.apache.nifi.web.api.ApplicationResource.ReplicationTarget;
import org.apache.nifi.web.api.dto.AllowableValueDTO;
import org.apache.nifi.web.api.dto.ControllerServiceDTO;
import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
@@ -72,14 +73,12 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Set;
/**
* Implements the NiFiWebConfigurationContext interface to support a context in both standalone and clustered environments.
@@ -292,17 +291,25 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
return componentFacade.updateComponent(requestContext, annotationData, properties);
}
+ private ReplicationTarget getReplicationTarget() {
+ return clusterCoordinator.isActiveClusterCoordinator() ? ReplicationTarget.CLUSTER_NODES : ReplicationTarget.CLUSTER_COORDINATOR;
+ }
+
private NodeResponse replicate(final String method, final URI uri, final Object entity, final Map<String, String> headers) throws InterruptedException {
final NodeIdentifier coordinatorNode = clusterCoordinator.getElectedActiveCoordinatorNode();
if (coordinatorNode == null) {
throw new NoClusterCoordinatorException();
}
- final Set<NodeIdentifier> coordinatorNodes = Collections.singleton(coordinatorNode);
- return requestReplicator.replicate(coordinatorNodes, method, uri, entity, headers, false, true).awaitMergedResponse();
+ // Determine whether we should replicate only to the cluster coordinator, or if we should replicate directly
+ // to the cluster nodes themselves.
+ if (getReplicationTarget() == ReplicationTarget.CLUSTER_NODES) {
+ return requestReplicator.replicate(method, uri, entity, headers).awaitMergedResponse();
+ } else {
+ return requestReplicator.forwardToCoordinator(coordinatorNode, method, uri, entity, headers).awaitMergedResponse();
+ }
}
-
/**
* Facade over accessing different types of NiFi components.
*/
[2/2] nifi git commit: Merge remote-tracking branch 'origin/master'
Posted by ym...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/de717da7
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/de717da7
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/de717da7
Branch: refs/heads/master
Commit: de717da73f58cabc09813498668afe02bf07f462
Parents: dd9ecc2 3ac3b8d
Author: Yolanda M. Davis <ym...@apache.org>
Authored: Tue Sep 27 12:01:46 2016 -0400
Committer: Yolanda M. Davis <ym...@apache.org>
Committed: Tue Sep 27 12:01:46 2016 -0400
----------------------------------------------------------------------
.../src/main/asciidoc/images/CopyOnWrite.png | Bin 390951 -> 372807 bytes
.../src/main/asciidoc/images/DataIngress.png | Bin 121403 -> 95465 bytes
nifi-docs/src/main/asciidoc/images/Funnels.png | Bin 443291 -> 429177 bytes
.../main/asciidoc/images/NiFiArchitecture.png | Bin 30148 -> 0 bytes
.../main/asciidoc/images/PassByReference.png | Bin 488986 -> 555760 bytes
.../main/asciidoc/images/UpdatingAttributes.png | Bin 343737 -> 389071 bytes
.../src/main/asciidoc/images/WebCrawler.png | Bin 445250 -> 366160 bytes
nifi-docs/src/main/asciidoc/nifi-in-depth.adoc | 67 ++++++++++---------
8 files changed, 34 insertions(+), 33 deletions(-)
----------------------------------------------------------------------