[jira] [Commented] (NIFI-145) Develop Bootstrap module
[ https://issues.apache.org/jira/browse/NIFI-145?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14244210#comment-14244210 ] ASF subversion and git services commented on NIFI-145: -- Commit 76f54f86115e42d16f700aa0d1c5bce22f830734 in incubator-nifi's branch refs/heads/bootstrap from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=76f54f8 ] NIFI-145: Allow a run.as user to be set in bootstrap.conf file; addressed concerns where an un-priveleged user could issue commands to running NiFi to shutdown; addressed concerns where an un-priveleged user could push large amounts of data to the Bootstrap or NiFi causing OOME Develop Bootstrap module Key: NIFI-145 URL: https://issues.apache.org/jira/browse/NIFI-145 Project: Apache NiFi Issue Type: New Feature Components: Core Framework Affects Versions: 0.0.1 Reporter: Mark Payne Assignee: Mark Payne Original Estimate: 72h Remaining Estimate: 72h We need a module that can parse a configuration file in order to determine runtime parameters to run the Java executable for NiFi. This should include JVM args, such as agentlib, Xmx, Xms, etc., as well as indicating where the NiFi properties file can be found and what the Java command should be (java vs. $JAVA_HOME/bin/java, etc.) -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-164: Add shutdown() method to ContentRepository and implement in FileSystemRepository and VolatileContentRepository to cleanup executors; call shutdown() from FlowContr
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI164 [created] 55d4b1c09
NIFI-164: Add shutdown() method to ContentRepository and implement in
FileSystemRepository and VolatileContentRepository to cleanup executors; call
shutdown() from FlowController shutdown method
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/55d4b1c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/55d4b1c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/55d4b1c0
Branch: refs/heads/NIFI164
Commit: 55d4b1c09990a9cff8a235fe65a0056879e6355a
Parents: 2bcd1e6
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:00:40 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:00:40 2014 -0500
--
.../main/java/org/apache/nifi/controller/FlowController.java | 4
.../nifi/controller/repository/FileSystemRepository.java | 6 ++
.../nifi/controller/repository/VolatileContentRepository.java | 5 +
.../apache/nifi/controller/repository/ContentRepository.java | 6 ++
4 files changed, 21 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index 20c50b5..e1abe4e 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -1050,6 +1050,10 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, H
processScheduler.shutdown();
}
+if ( contentRepository != null ) {
+contentRepository.shutdown();
+}
+
if ( provenanceEventRepository != null ) {
try {
provenanceEventRepository.close();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index ba74295..5fbbfd5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -223,6 +223,12 @@ public class FileSystemRepository implements
ContentRepository {
this.contentClaimManager = claimManager;
}
+@Override
+public void shutdown() {
+executor.shutdown();
+containerCleanupExecutor.shutdown();
+}
+
private static double getRatio(final String value) {
final String trimmed = value.trim();
final String percentage = trimmed.substring(0, trimmed.length() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
index e14ec5d..99e3655 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
@@ -137,6 +137,11 @@ public class VolatileContentRepository implements
ContentRepository {
public void initialize(final ContentClaimManager claimManager) {
this.claimManager = claimManager;
}
+
+@Override
+public void shutdown() {
+executor.shutdown();
+}
/**
* Specifies a Backup Repository where data should be written if this
[2/3] incubator-nifi git commit: Merge branch 'NIFI164' into bootstrap
Merge branch 'NIFI164' into bootstrap Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8cf0c781 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8cf0c781 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8cf0c781 Branch: refs/heads/bootstrap Commit: 8cf0c7814e7c3b451ba58eb97b8e93a3ce518ed6 Parents: 76f54f8 55d4b1c Author: Mark Payne marka...@hotmail.com Authored: Fri Dec 12 10:01:17 2014 -0500 Committer: Mark Payne marka...@hotmail.com Committed: Fri Dec 12 10:01:17 2014 -0500 -- .../main/java/org/apache/nifi/controller/FlowController.java | 4 .../nifi/controller/repository/FileSystemRepository.java | 6 ++ .../nifi/controller/repository/VolatileContentRepository.java | 5 + .../apache/nifi/controller/repository/ContentRepository.java | 6 ++ 4 files changed, 21 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8cf0c781/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java --
[3/3] incubator-nifi git commit: NIFI-145: Fixed issue that indicated that NiFi was hung or died when the .pid file wasn't found
NIFI-145: Fixed issue that indicated that NiFi was hung or died when the .pid
file wasn't found
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2a2f0f03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2a2f0f03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2a2f0f03
Branch: refs/heads/bootstrap
Commit: 2a2f0f036434c0fa2dd0f6af67e6cf13b0b3183e
Parents: 8cf0c78
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:18:14 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:18:14 2014 -0500
--
.../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java| 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2a2f0f03/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
--
diff --git
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index a230711..270ba48 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -373,6 +373,11 @@ public class RunNiFi {
return;
}
+ if ( status.getPort() == null ) {
+ logger.info(Apache NiFi is not running);
+ return;
+ }
+
if ( status.getPid() == null ) {
logger.info(Apache NiFi is not responding to Ping requests.
The process may have died or may be hung);
} else {
[1/3] incubator-nifi git commit: NIFI-164: Add shutdown() method to ContentRepository and implement in FileSystemRepository and VolatileContentRepository to cleanup executors; call shutdown() from Flo
Repository: incubator-nifi
Updated Branches:
refs/heads/bootstrap 76f54f861 - 2a2f0f036
NIFI-164: Add shutdown() method to ContentRepository and implement in
FileSystemRepository and VolatileContentRepository to cleanup executors; call
shutdown() from FlowController shutdown method
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/55d4b1c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/55d4b1c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/55d4b1c0
Branch: refs/heads/bootstrap
Commit: 55d4b1c09990a9cff8a235fe65a0056879e6355a
Parents: 2bcd1e6
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:00:40 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:00:40 2014 -0500
--
.../main/java/org/apache/nifi/controller/FlowController.java | 4
.../nifi/controller/repository/FileSystemRepository.java | 6 ++
.../nifi/controller/repository/VolatileContentRepository.java | 5 +
.../apache/nifi/controller/repository/ContentRepository.java | 6 ++
4 files changed, 21 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index 20c50b5..e1abe4e 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -1050,6 +1050,10 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, H
processScheduler.shutdown();
}
+if ( contentRepository != null ) {
+contentRepository.shutdown();
+}
+
if ( provenanceEventRepository != null ) {
try {
provenanceEventRepository.close();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index ba74295..5fbbfd5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -223,6 +223,12 @@ public class FileSystemRepository implements
ContentRepository {
this.contentClaimManager = claimManager;
}
+@Override
+public void shutdown() {
+executor.shutdown();
+containerCleanupExecutor.shutdown();
+}
+
private static double getRatio(final String value) {
final String trimmed = value.trim();
final String percentage = trimmed.substring(0, trimmed.length() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
index e14ec5d..99e3655 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
@@ -137,6 +137,11 @@ public class VolatileContentRepository implements
ContentRepository {
public void initialize(final ContentClaimManager claimManager) {
this.claimManager = claimManager;
}
+
+@Override
+public void shutdown() {
+executor.shutdown();
+}
/**
* Specifies a Backup Repository where data should be written if this
[jira] [Commented] (NIFI-164) ContentRepository needs to have a shutdown method
[ https://issues.apache.org/jira/browse/NIFI-164?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14244256#comment-14244256 ] ASF subversion and git services commented on NIFI-164: -- Commit 55d4b1c09990a9cff8a235fe65a0056879e6355a in incubator-nifi's branch refs/heads/bootstrap from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=55d4b1c ] NIFI-164: Add shutdown() method to ContentRepository and implement in FileSystemRepository and VolatileContentRepository to cleanup executors; call shutdown() from FlowController shutdown method ContentRepository needs to have a shutdown method - Key: NIFI-164 URL: https://issues.apache.org/jira/browse/NIFI-164 Project: Apache NiFi Issue Type: Bug Components: Core Framework Affects Versions: 0.0.1 Reporter: Mark Payne Assignee: Mark Payne Fix For: 0.0.1 Currently, the ContentRepository interface doesn't support a shutdown() method, which means that the implementations are unable to cleanup their resource when NiFi is shutdown. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-164: Fixed MockContentRepository that existed in a unit test
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI164 55d4b1c09 - d57861d8b
NIFI-164: Fixed MockContentRepository that existed in a unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d57861d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d57861d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d57861d8
Branch: refs/heads/NIFI164
Commit: d57861d8b5283483b5721f5c4be3ce285ea6bcf4
Parents: 55d4b1c
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:19:20 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:19:20 2014 -0500
--
.../nifi/controller/repository/TestStandardProcessSession.java | 4
.../org/apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 060bbd9..1ff63c5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++
b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
@@ -977,6 +977,10 @@ public class TestStandardProcessSession {
private ConcurrentMapContentClaim, AtomicInteger claimantCounts =
new ConcurrentHashMap();
+@Override
+public void shutdown() {
+}
+
public SetContentClaim getExistingClaims() {
final SetContentClaim claims = new HashSet();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
--
diff --git
a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
index 9de2661..f4f9d12 100644
---
a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
+++
b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
@@ -169,6 +169,8 @@ public class VolatileProvenanceRepository implements
ProvenanceEventRepository {
@Override
public void close() throws IOException {
+queryExecService.shutdownNow();
+scheduledExecService.shutdown();
}
@Override
[jira] [Commented] (NIFI-164) ContentRepository needs to have a shutdown method
[ https://issues.apache.org/jira/browse/NIFI-164?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14244259#comment-14244259 ] ASF subversion and git services commented on NIFI-164: -- Commit d57861d8b5283483b5721f5c4be3ce285ea6bcf4 in incubator-nifi's branch refs/heads/NIFI164 from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=d57861d ] NIFI-164: Fixed MockContentRepository that existed in a unit test ContentRepository needs to have a shutdown method - Key: NIFI-164 URL: https://issues.apache.org/jira/browse/NIFI-164 Project: Apache NiFi Issue Type: Bug Components: Core Framework Affects Versions: 0.0.1 Reporter: Mark Payne Assignee: Mark Payne Fix For: 0.0.1 Currently, the ContentRepository interface doesn't support a shutdown() method, which means that the implementations are unable to cleanup their resource when NiFi is shutdown. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[2/3] incubator-nifi git commit: NIFI-164: Fixed MockContentRepository that existed in a unit test
NIFI-164: Fixed MockContentRepository that existed in a unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d57861d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d57861d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d57861d8
Branch: refs/heads/develop
Commit: d57861d8b5283483b5721f5c4be3ce285ea6bcf4
Parents: 55d4b1c
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:19:20 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:19:20 2014 -0500
--
.../nifi/controller/repository/TestStandardProcessSession.java | 4
.../org/apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 060bbd9..1ff63c5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++
b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
@@ -977,6 +977,10 @@ public class TestStandardProcessSession {
private ConcurrentMapContentClaim, AtomicInteger claimantCounts =
new ConcurrentHashMap();
+@Override
+public void shutdown() {
+}
+
public SetContentClaim getExistingClaims() {
final SetContentClaim claims = new HashSet();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
--
diff --git
a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
index 9de2661..f4f9d12 100644
---
a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
+++
b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
@@ -169,6 +169,8 @@ public class VolatileProvenanceRepository implements
ProvenanceEventRepository {
@Override
public void close() throws IOException {
+queryExecService.shutdownNow();
+scheduledExecService.shutdown();
}
@Override
[3/3] incubator-nifi git commit: Merge branch 'NIFI164' into develop
Merge branch 'NIFI164' into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/67354bd3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67354bd3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67354bd3 Branch: refs/heads/develop Commit: 67354bd31cafe1b646e9a4102c251c0772ef39af Parents: 52eadeb d57861d Author: Mark Payne marka...@hotmail.com Authored: Fri Dec 12 10:25:39 2014 -0500 Committer: Mark Payne marka...@hotmail.com Committed: Fri Dec 12 10:25:39 2014 -0500 -- .../main/java/org/apache/nifi/controller/FlowController.java | 4 .../nifi/controller/repository/FileSystemRepository.java | 6 ++ .../nifi/controller/repository/VolatileContentRepository.java | 5 + .../nifi/controller/repository/TestStandardProcessSession.java | 4 .../apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++ .../apache/nifi/controller/repository/ContentRepository.java | 6 ++ 6 files changed, 27 insertions(+) --
[1/3] incubator-nifi git commit: NIFI-164: Add shutdown() method to ContentRepository and implement in FileSystemRepository and VolatileContentRepository to cleanup executors; call shutdown() from Flo
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 52eadeba1 - 67354bd31
NIFI-164: Add shutdown() method to ContentRepository and implement in
FileSystemRepository and VolatileContentRepository to cleanup executors; call
shutdown() from FlowController shutdown method
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/55d4b1c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/55d4b1c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/55d4b1c0
Branch: refs/heads/develop
Commit: 55d4b1c09990a9cff8a235fe65a0056879e6355a
Parents: 2bcd1e6
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:00:40 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:00:40 2014 -0500
--
.../main/java/org/apache/nifi/controller/FlowController.java | 4
.../nifi/controller/repository/FileSystemRepository.java | 6 ++
.../nifi/controller/repository/VolatileContentRepository.java | 5 +
.../apache/nifi/controller/repository/ContentRepository.java | 6 ++
4 files changed, 21 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index 20c50b5..e1abe4e 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -1050,6 +1050,10 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, H
processScheduler.shutdown();
}
+if ( contentRepository != null ) {
+contentRepository.shutdown();
+}
+
if ( provenanceEventRepository != null ) {
try {
provenanceEventRepository.close();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index ba74295..5fbbfd5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -223,6 +223,12 @@ public class FileSystemRepository implements
ContentRepository {
this.contentClaimManager = claimManager;
}
+@Override
+public void shutdown() {
+executor.shutdown();
+containerCleanupExecutor.shutdown();
+}
+
private static double getRatio(final String value) {
final String trimmed = value.trim();
final String percentage = trimmed.substring(0, trimmed.length() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
index e14ec5d..99e3655 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
@@ -137,6 +137,11 @@ public class VolatileContentRepository implements
ContentRepository {
public void initialize(final ContentClaimManager claimManager) {
this.claimManager = claimManager;
}
+
+@Override
+public void shutdown() {
+executor.shutdown();
+}
/**
* Specifies a Backup Repository where data should be written if this
[jira] [Resolved] (NIFI-164) ContentRepository needs to have a shutdown method
[ https://issues.apache.org/jira/browse/NIFI-164?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne resolved NIFI-164. - Resolution: Fixed ContentRepository needs to have a shutdown method - Key: NIFI-164 URL: https://issues.apache.org/jira/browse/NIFI-164 Project: Apache NiFi Issue Type: Bug Components: Core Framework Affects Versions: 0.0.1 Reporter: Mark Payne Assignee: Mark Payne Fix For: 0.0.1 Currently, the ContentRepository interface doesn't support a shutdown() method, which means that the implementations are unable to cleanup their resource when NiFi is shutdown. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[2/5] incubator-nifi git commit: another change for goofy netbeans configs
another change for goofy netbeans configs Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/52eadeba Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/52eadeba Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/52eadeba Branch: refs/heads/bootstrap Commit: 52eadeba1827e462f34bd6b6df79f88859091ef2 Parents: f1baec6 Author: joewitt joew...@apache.org Authored: Thu Dec 11 13:54:25 2014 -0500 Committer: joewitt joew...@apache.org Committed: Thu Dec 11 13:54:25 2014 -0500 -- .../web/nifi-web-api/nb-configuration.xml | 18 -- 1 file changed, 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/52eadeba/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml deleted file mode 100644 index d290d45..000 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml +++ /dev/null @@ -1,18 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -project-shared-configuration -!-- -This file contains additional configuration written by modules in the NetBeans IDE. -The configuration is intended to be shared among all the users of project and -therefore it is assumed to be part of version control checkout. -Without this configuration present, some functionality in the IDE may be limited or fail altogether. --- -properties xmlns=http://www.netbeans.org/ns/maven-properties-data/1; -!-- -Properties that influence various parts of the IDE, especially code formatting and the like. -You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up. -That way multiple projects can share the same settings (useful for formatting rules for example). -Any value defined here will override the pom.xml file value but is only applicable to the current project. --- - org-netbeans-modules-maven-jaxws.rest_2e_config_2e_typeide/org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type -/properties -/project-shared-configuration
[5/5] incubator-nifi git commit: Merge branch 'develop' into bootstrap
Merge branch 'develop' into bootstrap Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d1271a28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d1271a28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d1271a28 Branch: refs/heads/bootstrap Commit: d1271a281e79a714a1c098465e29ef2925675e2b Parents: 2a2f0f0 67354bd Author: Mark Payne marka...@hotmail.com Authored: Fri Dec 12 10:31:50 2014 -0500 Committer: Mark Payne marka...@hotmail.com Committed: Fri Dec 12 10:31:50 2014 -0500 -- .gitignore| 1 + .../repository/TestStandardProcessSession.java| 4 .../web/nifi-web-api/nb-configuration.xml | 18 -- .../provenance/VolatileProvenanceRepository.java | 2 ++ 4 files changed, 7 insertions(+), 18 deletions(-) --
[jira] [Commented] (NIFI-164) ContentRepository needs to have a shutdown method
[ https://issues.apache.org/jira/browse/NIFI-164?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14244280#comment-14244280 ] ASF subversion and git services commented on NIFI-164: -- Commit d57861d8b5283483b5721f5c4be3ce285ea6bcf4 in incubator-nifi's branch refs/heads/bootstrap from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=d57861d ] NIFI-164: Fixed MockContentRepository that existed in a unit test ContentRepository needs to have a shutdown method - Key: NIFI-164 URL: https://issues.apache.org/jira/browse/NIFI-164 Project: Apache NiFi Issue Type: Bug Components: Core Framework Affects Versions: 0.0.1 Reporter: Mark Payne Assignee: Mark Payne Fix For: 0.0.1 Currently, the ContentRepository interface doesn't support a shutdown() method, which means that the implementations are unable to cleanup their resource when NiFi is shutdown. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[4/5] incubator-nifi git commit: Merge branch 'NIFI164' into develop
Merge branch 'NIFI164' into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/67354bd3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67354bd3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67354bd3 Branch: refs/heads/bootstrap Commit: 67354bd31cafe1b646e9a4102c251c0772ef39af Parents: 52eadeb d57861d Author: Mark Payne marka...@hotmail.com Authored: Fri Dec 12 10:25:39 2014 -0500 Committer: Mark Payne marka...@hotmail.com Committed: Fri Dec 12 10:25:39 2014 -0500 -- .../main/java/org/apache/nifi/controller/FlowController.java | 4 .../nifi/controller/repository/FileSystemRepository.java | 6 ++ .../nifi/controller/repository/VolatileContentRepository.java | 5 + .../nifi/controller/repository/TestStandardProcessSession.java | 4 .../apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++ .../apache/nifi/controller/repository/ContentRepository.java | 6 ++ 6 files changed, 27 insertions(+) --
[3/5] incubator-nifi git commit: NIFI-164: Fixed MockContentRepository that existed in a unit test
NIFI-164: Fixed MockContentRepository that existed in a unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d57861d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d57861d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d57861d8
Branch: refs/heads/bootstrap
Commit: d57861d8b5283483b5721f5c4be3ce285ea6bcf4
Parents: 55d4b1c
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:19:20 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:19:20 2014 -0500
--
.../nifi/controller/repository/TestStandardProcessSession.java | 4
.../org/apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 060bbd9..1ff63c5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++
b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
@@ -977,6 +977,10 @@ public class TestStandardProcessSession {
private ConcurrentMapContentClaim, AtomicInteger claimantCounts =
new ConcurrentHashMap();
+@Override
+public void shutdown() {
+}
+
public SetContentClaim getExistingClaims() {
final SetContentClaim claims = new HashSet();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
--
diff --git
a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
index 9de2661..f4f9d12 100644
---
a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
+++
b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
@@ -169,6 +169,8 @@ public class VolatileProvenanceRepository implements
ProvenanceEventRepository {
@Override
public void close() throws IOException {
+queryExecService.shutdownNow();
+scheduledExecService.shutdown();
}
@Override
incubator-nifi git commit: NIFI-66:
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 67354bd31 - a8722317a
NIFI-66:
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a8722317
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a8722317
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a8722317
Branch: refs/heads/develop
Commit: a8722317abdbf28e86d3d4ed91e18d2f3ac2a40a
Parents: 67354bd
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 11:09:52 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 11:09:52 2014 -0500
--
.../apache/nifi/controller/repository/StandardProcessSession.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a8722317/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 11172a8..fbbb29b 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -479,7 +479,7 @@ public final class StandardProcessSession implements
ProcessSession, ProvenanceE
context.getFlowFileEventRepository().updateRepository(flowFileEvent);
-for (final FlowFileEvent connectionEvent :
connectionCounts.values()) {
+for (final FlowFileEvent connectionEvent :
checkpoint.connectionCounts.values()) {
context.getFlowFileEventRepository().updateRepository(connectionEvent);
}
} catch (final IOException ioe) {
[jira] [Commented] (NIFI-66) Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0
[ https://issues.apache.org/jira/browse/NIFI-66?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14244378#comment-14244378 ] ASF subversion and git services commented on NIFI-66: - Commit a8722317abdbf28e86d3d4ed91e18d2f3ac2a40a in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=a872231 ] NIFI-66: Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0 -- Key: NIFI-66 URL: https://issues.apache.org/jira/browse/NIFI-66 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.0.1 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (NIFI-66) Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0
[ https://issues.apache.org/jira/browse/NIFI-66?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne resolved NIFI-66. Resolution: Fixed Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0 -- Key: NIFI-66 URL: https://issues.apache.org/jira/browse/NIFI-66 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.0.1 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-66) Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0
[ https://issues.apache.org/jira/browse/NIFI-66?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14244388#comment-14244388 ] Matt Gilman commented on NIFI-66: - +1 Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0 -- Key: NIFI-66 URL: https://issues.apache.org/jira/browse/NIFI-66 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.0.1 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Closed] (NIFI-66) Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0
[ https://issues.apache.org/jira/browse/NIFI-66?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne closed NIFI-66. -- Connections' FlowFiles/Bytes In and FlowFiles/Bytes Out stats always 0 -- Key: NIFI-66 URL: https://issues.apache.org/jira/browse/NIFI-66 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.0.1 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-70) If provenance route event emitted but flowfile is routed to same queue, discard event
[ https://issues.apache.org/jira/browse/NIFI-70?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=1428#comment-1428 ] ASF subversion and git services commented on NIFI-70: - Commit bc94625142163d60af7aad27ec9de11b79c2ba21 in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=bc94625 ] NIFI-70: If ROUTE indicates FlowFile routed to same Connection it came from (and only that connection!) then drop the redundant ROUTE event If provenance route event emitted but flowfile is routed to same queue, discard event - Key: NIFI-70 URL: https://issues.apache.org/jira/browse/NIFI-70 Project: Apache NiFi Issue Type: Improvement Components: Core Framework Reporter: Joseph Witt Fix For: 0.0.1 This is not a useful event so just collapse/toss it. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-70: If ROUTE indicates FlowFile routed to same Connection it came from (and only that connection!) then drop the redundant ROUTE event
Repository: incubator-nifi
Updated Branches:
refs/heads/develop a8722317a - bc9462514
NIFI-70: If ROUTE indicates FlowFile routed to same Connection it came from
(and only that connection!) then drop the redundant ROUTE event
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/bc946251
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/bc946251
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/bc946251
Branch: refs/heads/develop
Commit: bc94625142163d60af7aad27ec9de11b79c2ba21
Parents: a872231
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 12:02:49 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 12:02:49 2014 -0500
--
.../repository/StandardProcessSession.java | 48 +++-
1 file changed, 47 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc946251/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index fbbb29b..60dcdb3 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -538,7 +538,14 @@ public final class StandardProcessSession implements
ProcessSession, ProvenanceE
if (isSpuriousForkEvent(event, checkpoint.removedFlowFiles)) {
continue;
}
-
+if ( isSpuriousRouteEvent(event, checkpoint.records) ) {
+continue;
+}
+
+// Check if the event indicates that the FlowFile was routed to
the same
+// connection from which it was pulled (and only this connection).
If so, discard the event.
+isSpuriousRouteEvent(event, checkpoint.records);
+
recordsToSubmit.add(event);
addEventType(eventTypesPerFlowFileId, event.getFlowFileUuid(),
event.getEventType());
}
@@ -776,6 +783,45 @@ public final class StandardProcessSession implements
ProcessSession, ProvenanceE
return false;
}
+
+/**
+ * Checks if the given event is a spurious ROUTE, meaning that the ROUTE
indicates that a FlowFile
+ * was routed to a relationship with only 1 connection and that Connection
is the Connection from which
+ * the FlowFile was pulled. I.e., the FlowFile was really routed nowhere.
+ *
+ * @param event
+ * @param records
+ * @return
+ */
+private boolean isSpuriousRouteEvent(final ProvenanceEventRecord event,
final MapFlowFileRecord, StandardRepositoryRecord records) {
+if ( event.getEventType() == ProvenanceEventType.ROUTE ) {
+final String relationshipName = event.getRelationship();
+final Relationship relationship = new
Relationship.Builder().name(relationshipName).build();
+final CollectionConnection connectionsForRelationship =
this.context.getConnections(relationship);
+
+// If the number of connections for this relationship is not 1,
then we can't ignore this ROUTE event,
+// as it may be cloning the FlowFile and adding to multiple
connections.
+if ( connectionsForRelationship.size() == 1 ) {
+for ( final Map.EntryFlowFileRecord,
StandardRepositoryRecord entry : records.entrySet() ) {
+final FlowFileRecord flowFileRecord = entry.getKey();
+if (
event.getFlowFileUuid().equals(flowFileRecord.getAttribute(CoreAttributes.UUID.key()))
) {
+final StandardRepositoryRecord repoRecord =
entry.getValue();
+if ( repoRecord.getOriginalQueue() == null ) {
+return false;
+}
+
+final String originalQueueId =
repoRecord.getOriginalQueue().getIdentifier();
+final Connection destinationConnection =
connectionsForRelationship.iterator().next();
+final String destinationQueueId =
destinationConnection.getFlowFileQueue().getIdentifier();
+return originalQueueId.equals(destinationQueueId);
+}
+}
+}
+}
+
+
[jira] [Created] (NIFI-165) The start script, nifi.sh, does not work on Mac OS X
Philip Young created NIFI-165: - Summary: The start script, nifi.sh, does not work on Mac OS X Key: NIFI-165 URL: https://issues.apache.org/jira/browse/NIFI-165 Project: Apache NiFi Issue Type: Bug Components: Configuration Affects Versions: 0.0.1 Environment: Mac OS X Reporter: Philip Young Unfortunately, Mac OS X does not handle the use of $0 to specify the name and path of the script that is being executed as well as other *nix, instead it is being resolved to . in the nifi.sh script. As a result, calls to dirname and basename are failing. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-165) The start script, nifi.sh, does not work on Mac OS X
[ https://issues.apache.org/jira/browse/NIFI-165?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14245159#comment-14245159 ] Joseph Witt commented on NIFI-165: -- Philip Can you show the command you were running to execute nifi? There are other Mac OS X users that have reported success so just wanting to narrow in on the issue. Thanks Joe The start script, nifi.sh, does not work on Mac OS X Key: NIFI-165 URL: https://issues.apache.org/jira/browse/NIFI-165 Project: Apache NiFi Issue Type: Bug Components: Configuration Affects Versions: 0.0.1 Environment: Mac OS X Reporter: Philip Young Labels: easyfix, scripts Unfortunately, Mac OS X does not handle the use of $0 to specify the name and path of the script that is being executed as well as other *nix, instead it is being resolved to . in the nifi.sh script. As a result, calls to dirname and basename are failing. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-165) The start script, nifi.sh, does not work on Mac OS X
[ https://issues.apache.org/jira/browse/NIFI-165?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14245161#comment-14245161 ] Joseph Witt commented on NIFI-165: -- another thing I mean to ask/mention: If you're running off the master branch we have resolved a problem identified by another Mac OS X user. The resolution is on the 'develop' branch. Thanks Joe The start script, nifi.sh, does not work on Mac OS X Key: NIFI-165 URL: https://issues.apache.org/jira/browse/NIFI-165 Project: Apache NiFi Issue Type: Bug Components: Configuration Affects Versions: 0.0.1 Environment: Mac OS X Reporter: Philip Young Labels: easyfix, scripts Unfortunately, Mac OS X does not handle the use of $0 to specify the name and path of the script that is being executed as well as other *nix, instead it is being resolved to . in the nifi.sh script. As a result, calls to dirname and basename are failing. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Issue Comment Deleted] (NIFI-165) The start script, nifi.sh, does not work on Mac OS X
[ https://issues.apache.org/jira/browse/NIFI-165?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joseph Witt updated NIFI-165: - Comment: was deleted (was: this ticket is possibly/likely a duplicate of the already resolved 154. ) The start script, nifi.sh, does not work on Mac OS X Key: NIFI-165 URL: https://issues.apache.org/jira/browse/NIFI-165 Project: Apache NiFi Issue Type: Bug Components: Configuration Affects Versions: 0.0.1 Environment: Mac OS X 10.9.5 running: GNU bash, version 3.2.53(1)-release (x86_64-apple-darwin13) Reporter: Philip Young Labels: easyfix, scripts Unfortunately, Mac OS X does not handle the use of $0 to specify the name and path of the script that is being executed as well as other *nix, instead it is being resolved to . in the nifi.sh script. As a result, calls to dirname and basename are failing. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
svn commit: r1645110 - /incubator/nifi/site/trunk/content/development/quickstart.md
Author: joewitt Date: Sat Dec 13 04:51:45 2014 New Revision: 1645110 URL: http://svn.apache.org/r1645110 Log: Added a reference to the develop branch so folks weren't stuck with what was on master. Modified: incubator/nifi/site/trunk/content/development/quickstart.md Modified: incubator/nifi/site/trunk/content/development/quickstart.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1645110r1=1645109r2=1645110view=diff == --- incubator/nifi/site/trunk/content/development/quickstart.md (original) +++ incubator/nifi/site/trunk/content/development/quickstart.md Sat Dec 13 04:51:45 2014 @@ -8,6 +8,10 @@ This documentation is in progress, but s Apache NiFi source code is version controlled using [Git][git] version control ([browse][gitbrowse]|[checkout][gitrepo]). +The code as it was initially contributed and entered the incubator is on the 'master' branch. + +To review changes as they occur while we work toward an initial release checkout the 'develop' branch. + ## Issue Tracking Track issues on the NIFI Project on the Apache Jira ([browse][jira]).
svn commit: r1645111 - /incubator/nifi/site/trunk/content/development/quickstart.md
Author: joewitt Date: Sat Dec 13 04:53:13 2014 New Revision: 1645111 URL: http://svn.apache.org/r1645111 Log: refined note about develop branch Modified: incubator/nifi/site/trunk/content/development/quickstart.md Modified: incubator/nifi/site/trunk/content/development/quickstart.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1645111r1=1645110r2=1645111view=diff == --- incubator/nifi/site/trunk/content/development/quickstart.md (original) +++ incubator/nifi/site/trunk/content/development/quickstart.md Sat Dec 13 04:53:13 2014 @@ -10,7 +10,7 @@ Apache NiFi source code is version contr The code as it was initially contributed and entered the incubator is on the 'master' branch. -To review changes as they occur while we work toward an initial release checkout the 'develop' branch. +To view the lastest codebase as we work toward an initial release checkout the 'develop' branch. ## Issue Tracking
