nifi git commit: NIFI-4642 updated tests to be more tolerant/variable to different system speeds. Many of these should be integration tests and not unit tests. This closes #2303.
Repository: nifi Updated Branches: refs/heads/master 45df23b1e -> dd981e87d NIFI-4642 updated tests to be more tolerant/variable to different system speeds. Many of these should be integration tests and not unit tests. This closes #2303. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/dd981e87 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dd981e87 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dd981e87 Branch: refs/heads/master Commit: dd981e87ddadc907590a1d89ef3925f668cb00c1 Parents: 45df23b Author: joewittAuthored: Tue Nov 28 12:51:47 2017 -0500 Committer: Mark Payne Committed: Thu Nov 30 14:59:58 2017 -0500 -- .../scheduling/TestProcessorLifecycle.java | 128 --- 1 file changed, 53 insertions(+), 75 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/dd981e87/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java index c544ef4..f8f0426 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestProcessorLifecycle.java @@ -72,6 +72,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.LockSupport; +import java.util.function.Supplier; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -86,7 +87,7 @@ public class TestProcessorLifecycle { private static final Logger logger = LoggerFactory.getLogger(TestProcessorLifecycle.class); private FlowController fc; -private Map properties = new HashMap<>(); +private Map properties = new HashMap<>(); private volatile String propsFile = TestProcessorLifecycle.class.getResource("/lifecycletest.nifi.properties").getFile(); @Before @@ -100,6 +101,23 @@ public class TestProcessorLifecycle { FileUtils.deleteDirectory(new File("./target/lifecycletest")); } +private void assertCondition(final Supplier supplier) { +assertCondition(supplier, 1000L); +} + +private void assertCondition(final Supplier supplier, final long delayToleranceMillis) { +final long startTime = System.currentTimeMillis(); +while (((System.currentTimeMillis() - startTime) < delayToleranceMillis) && !supplier.get()) { +try { +Thread.sleep(50); +} catch (InterruptedException ex) { +Thread.interrupted(); +break; +} +} +assertTrue(supplier.get()); +} + @Test public void validateEnableOperation() throws Exception { final FlowControllerAndSystemBundle fcsb = this.buildFlowControllerForTest(); @@ -109,17 +127,17 @@ public class TestProcessorLifecycle { final ProcessorNode testProcNode = fc.createProcessor(TestProcessor.class.getName(), UUID.randomUUID().toString(), fcsb.getSystemBundle().getBundleDetails().getCoordinate()); -assertEquals(ScheduledState.STOPPED, testProcNode.getScheduledState()); -assertEquals(ScheduledState.STOPPED, testProcNode.getPhysicalScheduledState()); +assertCondition(() -> ScheduledState.STOPPED == testProcNode.getScheduledState()); +assertCondition(() -> ScheduledState.STOPPED == testProcNode.getPhysicalScheduledState()); // validates idempotency for (int i = 0; i < 2; i++) { testProcNode.enable(); } -assertEquals(ScheduledState.STOPPED, testProcNode.getScheduledState()); -assertEquals(ScheduledState.STOPPED, testProcNode.getPhysicalScheduledState()); +assertCondition(() -> ScheduledState.STOPPED == testProcNode.getScheduledState()); +assertCondition(() -> ScheduledState.STOPPED == testProcNode.getPhysicalScheduledState()); testProcNode.disable(); -assertEquals(ScheduledState.DISABLED, testProcNode.getScheduledState()); -assertEquals(ScheduledState.DISABLED,
[nifi-minifi-cpp] Git Push Summary
Repository: nifi-minifi-cpp Updated Tags: refs/tags/rel/minifi-cpp-0.3.0 [created] 50a0011eb
svn commit: r1816750 - /nifi/site/trunk/minifi/download.html
Author: phrocker Date: Thu Nov 30 19:29:21 2017 New Revision: 1816750 URL: http://svn.apache.org/viewvc?rev=1816750=rev Log: MINIFICPP-304: Close out MiNiFi CPP 0.3.0 Release Modified: nifi/site/trunk/minifi/download.html Modified: nifi/site/trunk/minifi/download.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/minifi/download.html?rev=1816750=1816749=1816750=diff == --- nifi/site/trunk/minifi/download.html (original) +++ nifi/site/trunk/minifi/download.html Thu Nov 30 19:29:21 2017 @@ -159,16 +159,16 @@ MiNiFi C++ - cpp-0.2.0 + cpp-0.3.0 Sources: - https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz;>nifi-minifi-cpp-0.2.0-source.tar.gz -( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.asc;>asc, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.md5;>md5, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.sha1;>sha1, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.sha256;>sha256 ) + https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz;>nifi-minifi-cpp-0.3.0-source.tar.gz +( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.asc;>asc, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.md5;>md5, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.sha256;>sha256 ) @@ -176,30 +176,30 @@ Binaries Linux - RHEL Based Distributions - x86_64 - https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz;>nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz -( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.asc;>asc, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.md5;>md5, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.sha1;>sha1, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.sha256;>sha256 ) + https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz;>nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz +( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.asc;>asc, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.md5;>md5, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.sha256;>sha256 ) Linux - Debian Based Distributions - x86_64 - https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-debian-x86_64.tar.gz;>nifi-minifi-cpp-0.2.0-bin-linux-debian-x86_64.tar.gz -( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-debian-x86_64.tar.gz.asc;>asc, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-debian-x86_64.tar.gz.md5;>md5, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-debian-x86_64.tar.gz.sha1;>sha1, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-debian-x86_64.tar.gz.sha256;>sha256 ) +
nifi-site git commit: MINIFICPP-304: Update download links for latest MiNiFi C++ Release
Repository: nifi-site Updated Branches: refs/heads/master 2e8841a5e -> 818a8fe36 MINIFICPP-304: Update download links for latest MiNiFi C++ Release Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/818a8fe3 Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/818a8fe3 Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/818a8fe3 Branch: refs/heads/master Commit: 818a8fe3676e58fd1a54080ac98805cc18adfb3a Parents: 2e8841a Author: Marc ParisiAuthored: Thu Nov 30 14:18:45 2017 -0500 Committer: Marc Parisi Committed: Thu Nov 30 14:18:45 2017 -0500 -- src/pages/html/minifi/download.hbs | 44 - 1 file changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-site/blob/818a8fe3/src/pages/html/minifi/download.hbs -- diff --git a/src/pages/html/minifi/download.hbs b/src/pages/html/minifi/download.hbs index 93a1a8a..60c35bf 100644 --- a/src/pages/html/minifi/download.hbs +++ b/src/pages/html/minifi/download.hbs @@ -60,16 +60,16 @@ title: Apache NiFi - MiNiFi Downloads MiNiFi C++ - cpp-0.2.0 + cpp-0.3.0 Sources: - https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz;>nifi-minifi-cpp-0.2.0-source.tar.gz -( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.asc;>asc, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.md5;>md5, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.sha1;>sha1, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-source.tar.gz.sha256;>sha256 ) + https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz;>nifi-minifi-cpp-0.3.0-source.tar.gz +( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.asc;>asc, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.md5;>md5, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-source.tar.gz.sha256;>sha256 ) @@ -77,30 +77,30 @@ title: Apache NiFi - MiNiFi Downloads Binaries Linux - RHEL Based Distributions - x86_64 - https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz;>nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz -( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.asc;>asc, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.md5;>md5, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.sha1;>sha1, - https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.2.0/nifi-minifi-cpp-0.2.0-bin-linux-rhel-x86_64.tar.gz.sha256;>sha256 ) + https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz;>nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz +( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.asc;>asc, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.md5;>md5, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.3.0/nifi-minifi-cpp-0.3.0-bin-linux-rhel.tar.gz.sha256;>sha256 ) Linux - Debian Based Distributions - x86_64 -
svn commit: r23340 - /dev/nifi/KEYS
Author: aldrin Date: Thu Nov 30 18:11:14 2017 New Revision: 23340 Log: Adding Marc Parisi to KEYS. Modified: dev/nifi/KEYS Modified: dev/nifi/KEYS == --- dev/nifi/KEYS (original) +++ dev/nifi/KEYS Thu Nov 30 18:11:14 2017 @@ -2,7 +2,7 @@ This file contains the PGP keys of vario Users: pgp < KEYS gpg --import KEYS -Developers: +Developers: pgp -kxa and append it to this file. (pgpk -ll && pgpk -xa ) >> this file. (gpg --list-sigs @@ -1091,6 +1091,64 @@ MAz7jbvJTmJTIdK44YwM4Jlf1sF78g2/d7qR26J2 -END PGP PUBLIC KEY BLOCK- pub rsa4096 2017-11-14 [SC] B7B152D56B9114FD5EB1281C2F481C35B942E77C +uid [ultimate] Marc Parisi+sig 32F481C35B942E77C 2017-11-14 Marc Parisi +sub rsa4096 2017-11-14 [E] +sig 2F481C35B942E77C 2017-11-14 Marc Parisi + +-BEGIN PGP PUBLIC KEY BLOCK- + +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 +=dVDp +-END PGP PUBLIC KEY BLOCK- +pub rsa4096 2017-11-14 [SC] + B7B152D56B9114FD5EB1281C2F481C35B942E77C uid [ultimate] Marc Parisi sig 32F481C35B942E77C 2017-11-14 Marc Parisi sub rsa4096 2017-11-14 [E]
svn commit: r23339 - /dev/nifi/nifi-minifi-cpp/0.3.0/ /release/nifi/nifi-minifi-cpp/0.3.0/
Author: aldrin Date: Thu Nov 30 18:07:08 2017 New Revision: 23339 Log: “MINIFICPP-304” Added: release/nifi/nifi-minifi-cpp/0.3.0/ - copied from r23338, dev/nifi/nifi-minifi-cpp/0.3.0/ Removed: dev/nifi/nifi-minifi-cpp/0.3.0/
[jira] [Updated] (MINIFI-413) Apache NiFi Team link is broken on Sys Admin web page
[ https://issues.apache.org/jira/browse/MINIFI-413?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andrew Lim updated MINIFI-413: -- Description: The "Apache NiFi Team" link near the top of the MiNiFi System Administrator's Guide (https://nifi.apache.org/minifi/system-admin-guide.html) is broken. I believe the intent was to provide a mailto link to the Developer's Mailing List: Apache NiFi Team - d...@nifi.apache.org was: The "Apache NiFi Team" link near the top of the MiNiFi System Administrator's Guide (https://nifi.apache.org/minifi/system-admin-guide.html) is broken. I believe the intent was to provide a mailto link to the Developer's Mailing List (d...@nifi.apache.org) > Apache NiFi Team link is broken on Sys Admin web page > - > > Key: MINIFI-413 > URL: https://issues.apache.org/jira/browse/MINIFI-413 > Project: Apache NiFi MiNiFi > Issue Type: Bug > Components: Documentation >Reporter: Andrew Lim >Priority: Minor > > The "Apache NiFi Team" link near the top of the MiNiFi System Administrator's > Guide (https://nifi.apache.org/minifi/system-admin-guide.html) is broken. > I believe the intent was to provide a mailto link to the Developer's Mailing > List: > Apache NiFi Team - d...@nifi.apache.org -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Created] (MINIFI-413) Apache NiFi Team link is broken on Sys Admin web page
Andrew Lim created MINIFI-413: - Summary: Apache NiFi Team link is broken on Sys Admin web page Key: MINIFI-413 URL: https://issues.apache.org/jira/browse/MINIFI-413 Project: Apache NiFi MiNiFi Issue Type: Bug Components: Documentation Reporter: Andrew Lim Priority: Minor The "Apache NiFi Team" link near the top of the MiNiFi System Administrator's Guide (https://nifi.apache.org/minifi/system-admin-guide.html) is broken. I believe the intent was to provide a mailto link to the Developer's Mailing List (d...@nifi.apache.org) -- This message was sent by Atlassian JIRA (v6.4.14#64029)
nifi git commit: NIFI-4607, NIFI-3975, NIFI-4602, NIFI-4606: This closes #2272. Fixed bug in TailFile that caused new Primary Node to not pull current Clustered State when File Location was set to Rem
Repository: nifi Updated Branches: refs/heads/master 3b15ed855 -> 45df23b1e NIFI-4607, NIFI-3975, NIFI-4602, NIFI-4606: This closes #2272. Fixed bug in TailFile that caused new Primary Node to not pull current Clustered State when File Location was set to Remote. Fixed bug that caused TailFile to occasionally become 'stuck' when the file it is tailing is renamed and a new file is created with the same name. Removed the 'Rolling Strategy' property from TailFile because it is not actually used in the processor anymore. Deleted MonitorMemoryTest because the unit test was testing the behavior of FlowController more than the behavior of the reporting task itself and in order to do so had a dependency in the pom.xml on nifi-framework-core, which means that it no longer compiles when FlowController is modified. Signed-off-by: joewittProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/45df23b1 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/45df23b1 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/45df23b1 Branch: refs/heads/master Commit: 45df23b1e09f340fb2c7f3c3234462570ddb5f6b Parents: 3b15ed8 Author: Mark Payne Authored: Tue Nov 14 13:27:35 2017 -0500 Committer: joewitt Committed: Thu Nov 30 11:10:46 2017 -0500 -- .../nifi/processors/standard/TailFile.java | 205 +++ .../additionalDetails.html | 23 +-- .../nifi/processors/standard/TestTailFile.java | 38 +++- .../nifi-standard-reporting-tasks/pom.xml | 6 - .../nifi/controller/MonitorMemoryTest.java | 167 --- 5 files changed, 160 insertions(+), 279 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/45df23b1/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java index f5d3409..2234265 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java @@ -16,39 +16,9 @@ */ package org.apache.nifi.processors.standard; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.nifi.annotation.behavior.InputRequirement; -import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; -import org.apache.nifi.annotation.behavior.Restricted; -import org.apache.nifi.annotation.behavior.Stateful; -import org.apache.nifi.annotation.behavior.TriggerSerially; -import org.apache.nifi.annotation.behavior.WritesAttribute; -import org.apache.nifi.annotation.behavior.WritesAttributes; -import org.apache.nifi.annotation.documentation.CapabilityDescription; -import org.apache.nifi.annotation.documentation.Tags; -import org.apache.nifi.annotation.lifecycle.OnScheduled; -import org.apache.nifi.annotation.lifecycle.OnStopped; -import org.apache.nifi.components.AllowableValue; -import org.apache.nifi.components.PropertyDescriptor; -import org.apache.nifi.components.ValidationContext; -import org.apache.nifi.components.ValidationResult; -import org.apache.nifi.components.state.Scope; -import org.apache.nifi.components.state.StateMap; -import org.apache.nifi.flowfile.FlowFile; -import org.apache.nifi.flowfile.attributes.CoreAttributes; -import org.apache.nifi.processor.AbstractProcessor; -import org.apache.nifi.processor.ProcessContext; -import org.apache.nifi.processor.ProcessSession; -import org.apache.nifi.processor.Relationship; -import org.apache.nifi.processor.exception.ProcessException; -import org.apache.nifi.processor.io.OutputStreamCallback; -import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.stream.io.NullOutputStream; -import org.apache.nifi.stream.io.StreamUtils; - import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; +import java.io.EOFException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -77,6 +47,37 @@ import java.util.zip.CRC32; import java.util.zip.CheckedInputStream; import java.util.zip.Checksum; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.nifi.annotation.behavior.InputRequirement; +import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
nifi git commit: NIFI-4559: Add non-zero status relationship to ExecuteStreamCommand
Repository: nifi Updated Branches: refs/heads/master 33281300c -> 3b15ed855 NIFI-4559: Add non-zero status relationship to ExecuteStreamCommand NIFI-4559: Removed Penalize Non-zero Status property and updated doc per review comments Signed-off-by: Matthew BurgessThis closes #2246 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3b15ed85 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3b15ed85 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3b15ed85 Branch: refs/heads/master Commit: 3b15ed855cc4319844dac13ba3244dc8ddde6207 Parents: 3328130 Author: Matthew Burgess Authored: Thu Nov 2 11:22:50 2017 -0400 Committer: Matthew Burgess Committed: Thu Nov 30 10:12:00 2017 -0500 -- .../standard/ExecuteStreamCommand.java | 39 -- .../standard/TestExecuteStreamCommand.java | 42 ++-- 2 files changed, 64 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/3b15ed85/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java index 13e3c58..1c1137c 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java @@ -46,10 +46,10 @@ import org.apache.nifi.processor.io.OutputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.processors.standard.util.ArgumentUtils; import org.apache.nifi.processors.standard.util.SoftLimitBoundedByteArrayOutputStream; -import org.apache.nifi.stream.io.BufferedInputStream; -import org.apache.nifi.stream.io.BufferedOutputStream; import org.apache.nifi.stream.io.StreamUtils; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -115,7 +115,12 @@ import java.util.concurrent.atomic.AtomicReference; * * output-stream * - * The destination path for the flow file created from the command's output + * The destination path for the flow file created from the command's output, if the exit code is zero + * + * + * nonzero-status + * + * The destination path for the flow file created from the command's output, if the exit code is non-zero * * * @@ -138,11 +143,16 @@ public class ExecuteStreamCommand extends AbstractProcessor { public static final Relationship ORIGINAL_RELATIONSHIP = new Relationship.Builder() .name("original") -.description("FlowFiles that were successfully processed") +.description("FlowFiles that were successfully processed.") .build(); public static final Relationship OUTPUT_STREAM_RELATIONSHIP = new Relationship.Builder() .name("output stream") -.description("The destination path for the flow file created from the command's output") +.description("The destination path for the flow file created from the command's output, if the returned status code is zero.") +.build(); +public static final Relationship NONZERO_STATUS_RELATIONSHIP = new Relationship.Builder() +.name("nonzero status") +.description("The destination path for the flow file created from the command's output, if the returned status code is non-zero. " ++ "All flow files routed to this relationship will be penalized.") .build(); private AtomicReference relationships = new AtomicReference<>(); @@ -198,7 +208,7 @@ public class ExecuteStreamCommand extends AbstractProcessor { static final PropertyDescriptor PUT_OUTPUT_IN_ATTRIBUTE = new PropertyDescriptor.Builder() .name("Output Destination Attribute") .description("If set, the output of the stream command will be put into an attribute of the original FlowFile instead of a separate " -+ "FlowFile. There will no longer be a relationship for 'output stream'. The value of this property will be the key for the output attribute.") ++ "FlowFile. There will no longer be a relationship for 'output
nifi git commit: NIFI-4597 This closes #2283. correcting imports, checkstyle issues, and adding validator Add a property to override HTTP return code in ListenHTTP processor
Repository: nifi Updated Branches: refs/heads/master 3df3ff6c6 -> 33281300c NIFI-4597 This closes #2283. correcting imports, checkstyle issues, and adding validator Add a property to override HTTP return code in ListenHTTP processor Signed-off-by: joewittProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/33281300 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/33281300 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/33281300 Branch: refs/heads/master Commit: 33281300cd90842da426d6824e942c43d4cf4916 Parents: 3df3ff6 Author: sbouchex Authored: Tue Nov 21 20:23:26 2017 +0100 Committer: joewitt Committed: Thu Nov 30 10:02:32 2017 -0500 -- .../nifi/processors/standard/ListenHTTP.java| 11 ++ .../standard/servlets/ListenHTTPServlet.java| 4 +- .../processors/standard/TestListenHTTP.java | 114 +-- 3 files changed, 96 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/33281300/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java index 9ef4b74..c441104 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; import javax.servlet.Servlet; +import javax.servlet.http.HttpServletResponse; import javax.ws.rs.Path; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; @@ -126,6 +127,12 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR) .required(false) .build(); +public static final PropertyDescriptor RETURN_CODE = new PropertyDescriptor.Builder() +.name("Return Code") +.description("The HTTP return code returned after every HTTP call") +.defaultValue(String.valueOf(HttpServletResponse.SC_OK)) +.addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) +.build(); public static final String CONTEXT_ATTRIBUTE_PROCESSOR = "processor"; public static final String CONTEXT_ATTRIBUTE_LOGGER = "logger"; @@ -136,6 +143,7 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { public static final String CONTEXT_ATTRIBUTE_FLOWFILE_MAP = "flowFileMap"; public static final String CONTEXT_ATTRIBUTE_STREAM_THROTTLER = "streamThrottler"; public static final String CONTEXT_ATTRIBUTE_BASE_PATH = "basePath"; +public static final String CONTEXT_ATTRIBUTE_RETURN_CODE = "returnCode"; private volatile Server server = null; private final ConcurrentMap flowFileMap = new ConcurrentHashMap<>(); @@ -156,6 +164,7 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { descriptors.add(AUTHORIZED_DN_PATTERN); descriptors.add(MAX_UNCONFIRMED_TIME); descriptors.add(HEADERS_AS_ATTRIBUTES_REGEX); +descriptors.add(RETURN_CODE); this.properties = Collections.unmodifiableList(descriptors); } @@ -203,6 +212,7 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { final SSLContextService sslContextService = context.getProperty(SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class); final Double maxBytesPerSecond = context.getProperty(MAX_DATA_RATE).asDataSize(DataUnit.B); final StreamThrottler streamThrottler = (maxBytesPerSecond == null) ? null : new LeakyBucketStreamThrottler(maxBytesPerSecond.intValue()); +final int returnCode = context.getProperty(RETURN_CODE).asInteger(); throttlerRef.set(streamThrottler); final boolean needClientAuth = sslContextService != null && sslContextService.getTrustStoreFile() != null; @@ -284,6 +294,7 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { contextHandler.setAttribute(CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN, Pattern.compile(context.getProperty(AUTHORIZED_DN_PATTERN).getValue()));
nifi git commit: NIFI-4646: This closes #2306. - Ensuring the reason behind the SchemaNotFoundException is reported when interacting with the configured SchemaRegistry.
Repository: nifi Updated Branches: refs/heads/master 9ea9996b3 -> 3df3ff6c6 NIFI-4646: This closes #2306. - Ensuring the reason behind the SchemaNotFoundException is reported when interacting with the configured SchemaRegistry. Signed-off-by: joewittProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3df3ff6c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3df3ff6c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3df3ff6c Branch: refs/heads/master Commit: 3df3ff6c610760c3adb1dffdd75d8cbaed1b471b Parents: 9ea9996 Author: Matt Gilman Authored: Wed Nov 29 10:51:29 2017 -0500 Committer: joewitt Committed: Thu Nov 30 09:02:21 2017 -0500 -- .../standard/AbstractRecordProcessor.java | 26 +++- 1 file changed, 14 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/3df3ff6c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java index 422629d..6f777ea 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java @@ -17,17 +17,6 @@ package org.apache.nifi.processors.standard; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; - import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.flowfile.attributes.CoreAttributes; @@ -47,6 +36,17 @@ import org.apache.nifi.serialization.WriteResult; import org.apache.nifi.serialization.record.Record; import org.apache.nifi.serialization.record.RecordSchema; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + public abstract class AbstractRecordProcessor extends AbstractProcessor { static final PropertyDescriptor RECORD_READER = new PropertyDescriptor.Builder() @@ -128,7 +128,9 @@ public abstract class AbstractRecordProcessor extends AbstractProcessor { attributes.putAll(writeResult.getAttributes()); recordCount.set(writeResult.getRecordCount()); } -} catch (final SchemaNotFoundException | MalformedRecordException e) { +} catch (final SchemaNotFoundException e) { +throw new ProcessException(e.getLocalizedMessage(), e); +} catch (final MalformedRecordException e) { throw new ProcessException("Could not parse incoming data", e); } }