You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/29 17:24:23 UTC
[1/4] incubator-nifi git commit: NIFI-250: Restore Controller Service
using appropriate ID on restart
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 4737a41a9 -> 60ad99815
NIFI-250: Restore Controller Service using appropriate ID on restart
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/59f5b95c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/59f5b95c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/59f5b95c
Branch: refs/heads/NIFI-250
Commit: 59f5b95c3ac3b1660da35aec63c22b23347a5aa3
Parents: d60710b
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 09:56:55 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 09:56:55 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/controller/StandardFlowSynchronizer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/59f5b95c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index 08176f7..b8ad3ad 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -345,7 +345,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
private void addControllerService(final FlowController controller, final Element controllerServiceElement, final StringEncryptor encryptor) {
final ControllerServiceDTO dto = FlowFromDOMFactory.getControllerService(controllerServiceElement, encryptor);
- final ControllerServiceNode node = controller.createControllerService(dto.getType(), false);
+ final ControllerServiceNode node = controller.createControllerService(dto.getType(), dto.getId(), false);
node.setName(dto.getName());
node.setAvailability(Availability.valueOf(dto.getAvailability()));
node.setComments(dto.getComments());
[4/4] incubator-nifi git commit: NIFI-250: Load Controller Services
before processors or reporting tasks on restart
Posted by ma...@apache.org.
NIFI-250: Load Controller Services before processors or reporting tasks on restart
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/60ad9981
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/60ad9981
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/60ad9981
Branch: refs/heads/NIFI-250
Commit: 60ad998153f6c391f4a36f25b91629bde7d3e98b
Parents: cfaafa3
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 11:24:11 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 11:24:11 2015 -0500
----------------------------------------------------------------------
.../controller/StandardFlowSynchronizer.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/60ad9981/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index eb54839..33650e1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -225,15 +225,6 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
// get the root group XML element
final Element rootGroupElement = (Element) rootElement.getElementsByTagName("rootGroup").item(0);
- // if this controller isn't initialized or its emtpy, add the root group, otherwise update
- if (!initialized || existingFlowEmpty) {
- logger.trace("Adding root process group");
- addProcessGroup(controller, /* parent group */ null, rootGroupElement, encryptor);
- } else {
- logger.trace("Updating root process group");
- updateProcessGroup(controller, /* parent group */ null, rootGroupElement, encryptor);
- }
-
final Element controllerServicesElement = (Element) DomUtils.getChild(rootElement, "controllerServices");
if ( controllerServicesElement != null ) {
final List<Element> serviceElements = DomUtils.getChildElementsByTagName(controllerServicesElement, "controllerService");
@@ -245,7 +236,16 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
}
}
}
-
+
+ // if this controller isn't initialized or its emtpy, add the root group, otherwise update
+ if (!initialized || existingFlowEmpty) {
+ logger.trace("Adding root process group");
+ addProcessGroup(controller, /* parent group */ null, rootGroupElement, encryptor);
+ } else {
+ logger.trace("Updating root process group");
+ updateProcessGroup(controller, /* parent group */ null, rootGroupElement, encryptor);
+ }
+
final Element reportingTasksElement = (Element) DomUtils.getChild(rootElement, "reportingTasks");
if ( reportingTasksElement != null ) {
final List<Element> taskElements = DomUtils.getChildElementsByTagName(reportingTasksElement, "reportingTask");
[2/4] incubator-nifi git commit: NIFI-250: Restore appropriate
reporting task id on restart
Posted by ma...@apache.org.
NIFI-250: Restore appropriate reporting task id on restart
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/52d329ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/52d329ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/52d329ca
Branch: refs/heads/NIFI-250
Commit: 52d329ca036e059f50a169b726f4c202859ed0e1
Parents: 59f5b95
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 10:02:15 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 10:02:15 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/controller/FlowController.java | 8 +++++---
.../org/apache/nifi/controller/StandardFlowSynchronizer.java | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/52d329ca/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 297810b..209a4d6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -2469,12 +2469,14 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H
}
public ReportingTaskNode createReportingTask(final String type, final boolean firstTimeAdded) throws ReportingTaskInstantiationException {
- if (type == null) {
+ return createReportingTask(type, UUID.randomUUID().toString(), firstTimeAdded);
+ }
+
+ public ReportingTaskNode createReportingTask(final String type, final String id, final boolean firstTimeAdded) throws ReportingTaskInstantiationException {
+ if (type == null || id == null) {
throw new NullPointerException();
}
- final String id = UUID.randomUUID().toString();
-
ReportingTask task = null;
final ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
try {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/52d329ca/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index b8ad3ad..eb54839 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -379,7 +379,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
private void addReportingTask(final FlowController controller, final Element reportingTaskElement, final StringEncryptor encryptor) throws ReportingTaskInstantiationException {
final ReportingTaskDTO dto = FlowFromDOMFactory.getReportingTask(reportingTaskElement, encryptor);
- final ReportingTaskNode reportingTask = controller.createReportingTask(dto.getType(), false);
+ final ReportingTaskNode reportingTask = controller.createReportingTask(dto.getType(), dto.getId(), false);
reportingTask.setName(dto.getName());
reportingTask.setComments(dto.getComment());
reportingTask.setAvailability(Availability.valueOf(dto.getAvailability()));
[3/4] incubator-nifi git commit: Merge branch 'NIFI-250' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Posted by ma...@apache.org.
Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cfaafa3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cfaafa3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cfaafa3c
Branch: refs/heads/NIFI-250
Commit: cfaafa3c291bbbe1009c10c10204befea0482bbe
Parents: 52d329c 4737a41
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 10:55:09 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 10:55:09 2015 -0500
----------------------------------------------------------------------
.../nifi/web/api/dto/ControllerServiceDTO.java | 17 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 9 +
.../nf-controller-service-configuration.js | 325 +++++++-------
.../js/nf/canvas/nf-processor-configuration.js | 418 ++++++++++---------
4 files changed, 417 insertions(+), 352 deletions(-)
----------------------------------------------------------------------