Repository: nifi Updated Branches: refs/heads/master 992b5552b -> 7facf95cc
NIFI-1997: Use the 'autoResumeState' property defined in nifi.properties on each node instead of inheriting the property from the Cluster Coordinator This closes #520 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7facf95c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7facf95c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7facf95c Branch: refs/heads/master Commit: 7facf95cc5eda83d2c7f29d63691b4480304392d Parents: 992b555 Author: Mark Payne <[email protected]> Authored: Wed Jun 15 12:04:25 2016 -0400 Committer: Oleg Zhurakousky <[email protected]> Committed: Wed Jun 15 12:55:34 2016 -0400 ---------------------------------------------------------------------- .../nifi/cluster/protocol/StandardDataFlow.java | 19 ------------------- .../protocol/jaxb/message/AdaptedDataFlow.java | 14 -------------- .../protocol/jaxb/message/DataFlowAdapter.java | 2 -- .../apache/nifi/cluster/protocol/DataFlow.java | 5 ----- .../nifi/controller/StandardFlowService.java | 2 +- 5 files changed, 1 insertion(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7facf95c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java index fc3558a..4f4b88d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java @@ -34,8 +34,6 @@ public class StandardDataFlow implements Serializable, DataFlow { private final byte[] flow; private final byte[] snippetBytes; - private boolean autoStartProcessors; - /** * Constructs an instance. * @@ -55,7 +53,6 @@ public class StandardDataFlow implements Serializable, DataFlow { public StandardDataFlow(final DataFlow toCopy) { this.flow = copy(toCopy.getFlow()); this.snippetBytes = copy(toCopy.getSnippets()); - this.autoStartProcessors = toCopy.isAutoStartProcessors(); } private static byte[] copy(final byte[] bytes) { @@ -72,20 +69,4 @@ public class StandardDataFlow implements Serializable, DataFlow { public byte[] getSnippets() { return snippetBytes; } - - @Override - public boolean isAutoStartProcessors() { - return autoStartProcessors; - } - - /** - * - * Sets the flag to automatically start processors at application startup. - * - * @param autoStartProcessors true if processors should be automatically - * started at application startup; false otherwise - */ - public void setAutoStartProcessors(final boolean autoStartProcessors) { - this.autoStartProcessors = autoStartProcessors; - } } http://git-wip-us.apache.org/repos/asf/nifi/blob/7facf95c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java index 62796d7..8ce905b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java @@ -23,11 +23,6 @@ public class AdaptedDataFlow { private byte[] flow; private byte[] snippets; - private boolean autoStartProcessors; - - public AdaptedDataFlow() { - } - public byte[] getFlow() { return flow; } @@ -43,13 +38,4 @@ public class AdaptedDataFlow { public void setSnippets(byte[] snippets) { this.snippets = snippets; } - - public boolean isAutoStartProcessors() { - return autoStartProcessors; - } - - public void setAutoStartProcessors(boolean runningAllProcessors) { - this.autoStartProcessors = runningAllProcessors; - } - } http://git-wip-us.apache.org/repos/asf/nifi/blob/7facf95c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java index fc7f54f..bd45a99 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java @@ -32,7 +32,6 @@ public class DataFlowAdapter extends XmlAdapter<AdaptedDataFlow, DataFlow> { if (df != null) { aDf.setFlow(df.getFlow()); aDf.setSnippets(df.getSnippets()); - aDf.setAutoStartProcessors(df.isAutoStartProcessors()); } return aDf; @@ -41,7 +40,6 @@ public class DataFlowAdapter extends XmlAdapter<AdaptedDataFlow, DataFlow> { @Override public DataFlow unmarshal(final AdaptedDataFlow aDf) { final StandardDataFlow dataFlow = new StandardDataFlow(aDf.getFlow(), aDf.getSnippets()); - dataFlow.setAutoStartProcessors(aDf.isAutoStartProcessors()); return dataFlow; } http://git-wip-us.apache.org/repos/asf/nifi/blob/7facf95c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java index 312e3b0..a4daa40 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java @@ -28,9 +28,4 @@ public interface DataFlow { */ public byte[] getSnippets(); - /** - * @return true if processors should be automatically started at application - * startup; false otherwise - */ - public boolean isAutoStartProcessors(); } http://git-wip-us.apache.org/repos/asf/nifi/blob/7facf95c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java ---------------------------------------------------------------------- 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 922bff0..3dc2588 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 @@ -855,7 +855,7 @@ public class StandardFlowService implements FlowService, ProtocolHandler { controller.setConnectionStatus(new NodeConnectionStatus(nodeId, NodeConnectionState.CONNECTED)); // start the processors as indicated by the dataflow - controller.onFlowInitialized(dataFlow.isAutoStartProcessors()); + controller.onFlowInitialized(autoResumeState); loadSnippets(dataFlow.getSnippets());
