[jira] [Commented] (NIFI-743) .getSolr-mock-processor and .httpCache-mock-processor files in conf dir
[ https://issues.apache.org/jira/browse/NIFI-743?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613185#comment-14613185 ] Matt Gilman commented on NIFI-743: -- [~markap14] [~bbende] [~danbress] Just wanted to make sure everyone was on the same page going forward as this ticket relates to NIFI-735. As Dan described above during documentation generation, we are only going to be invoking OnShutdown as a mechanism for components to clean up. We will not be using OnRemoved since we are never calling OnAdded. Thoughts? .getSolr-mock-processor and .httpCache-mock-processor files in conf dir --- Key: NIFI-743 URL: https://issues.apache.org/jira/browse/NIFI-743 Project: Apache NiFi Issue Type: Bug Components: Tools and Build Reporter: Mark Payne Assignee: Bryan Bende Fix For: 0.2.0 Attachments: NIFI-743.patch I'm not sure where these are coming from but when I do a clean build, I'm ending up with 2 files in the conf/ directory that shouldn't be there: .httpCache-mock-processor and .getSolr-mock-processor. Not sure if these were created when I did the build or when I launched the application, but either way they shouldn't be there. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-679) InvokeHTTP - Add support for basic authentication
[ https://issues.apache.org/jira/browse/NIFI-679?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613178#comment-14613178 ] ASF subversion and git services commented on NIFI-679: -- Commit 9d6458ab2800add00312e129bf60cd04ead350f9 in incubator-nifi's branch refs/heads/develop from [~jskora] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=9d6458a ] NIFI-679: Incorporate Basic Authentication handling into InvokeHTTP processor. Signed-off-by: Matt Gilman matt.c.gil...@gmail.com InvokeHTTP - Add support for basic authentication - Key: NIFI-679 URL: https://issues.apache.org/jira/browse/NIFI-679 Project: Apache NiFi Issue Type: Improvement Components: Extensions Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: nifi-679.patch InvokeHTTP should optionally support username/password for web services that do not employ certificate based authentication. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[1/2] incubator-nifi git commit: NIFI-733: Make use of Client Name, Zookeeper Timeout, Kafka Timeout properties and add new Group ID property
Repository: incubator-nifi Updated Branches: refs/heads/develop b17184946 - 322ac6fba NIFI-733: Make use of Client Name, Zookeeper Timeout, Kafka Timeout properties and add new Group ID property Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/786bc1d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/786bc1d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/786bc1d6 Branch: refs/heads/develop Commit: 786bc1d61260e2d8558747ca206d360aebdd1994 Parents: 063afe2 Author: Mark Payne marka...@hotmail.com Authored: Fri Jul 3 09:04:52 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 09:04:52 2015 -0400 -- .../apache/nifi/processors/kafka/GetKafka.java | 28 +++- 1 file changed, 22 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/786bc1d6/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java -- diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java index 1b63a46..26590df 100644 --- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java +++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java @@ -129,6 +129,7 @@ public class GetKafka extends AbstractProcessor { .expressionLanguageSupported(false) .defaultValue(\\n) .build(); + public static final PropertyDescriptor CLIENT_NAME = new PropertyDescriptor.Builder() .name(Client Name) .description(Client Name to use when communicating with Kafka) @@ -136,6 +137,13 @@ public class GetKafka extends AbstractProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(false) .build(); +public static final PropertyDescriptor GROUP_ID = new PropertyDescriptor.Builder() +.name(Group ID) +.description(A Group ID is used to identify consumers that are within the same consumer group) +.required(true) +.addValidator(StandardValidators.NON_EMPTY_VALIDATOR) +.expressionLanguageSupported(false) +.build(); public static final Relationship REL_SUCCESS = new Relationship.Builder() .name(success) @@ -152,9 +160,13 @@ public class GetKafka extends AbstractProcessor { @Override protected ListPropertyDescriptor getSupportedPropertyDescriptors() { final PropertyDescriptor clientNameWithDefault = new PropertyDescriptor.Builder() -.fromPropertyDescriptor(CLIENT_NAME) -.defaultValue(NiFi- + getIdentifier()) -.build(); +.fromPropertyDescriptor(CLIENT_NAME) +.defaultValue(NiFi- + getIdentifier()) +.build(); +final PropertyDescriptor groupIdWithDefault = new PropertyDescriptor.Builder() +.fromPropertyDescriptor(GROUP_ID) +.defaultValue(getIdentifier()) +.build(); final ListPropertyDescriptor props = new ArrayList(); props.add(ZOOKEEPER_CONNECTION_STRING); @@ -163,6 +175,7 @@ public class GetKafka extends AbstractProcessor { props.add(BATCH_SIZE); props.add(MESSAGE_DEMARCATOR); props.add(clientNameWithDefault); +props.add(groupIdWithDefault); props.add(KAFKA_TIMEOUT); props.add(ZOOKEEPER_TIMEOUT); return props; @@ -184,10 +197,13 @@ public class GetKafka extends AbstractProcessor { final Properties props = new Properties(); props.setProperty(zookeeper.connect, context.getProperty(ZOOKEEPER_CONNECTION_STRING).getValue()); -props.setProperty(group.id, getIdentifier()); +props.setProperty(group.id, context.getProperty(GROUP_ID).getValue()); +props.setProperty(client.id, context.getProperty(CLIENT_NAME).getValue()); props.setProperty(auto.commit.interval.ms, String.valueOf(context.getProperty(ZOOKEEPER_COMMIT_DELAY).asTimePeriod(TimeUnit.MILLISECONDS))); props.setProperty(auto.commit.enable, true); // just be explicit props.setProperty(auto.offset.reset, smallest); +props.setProperty(zk.connectiontimeout.ms, context.getProperty(ZOOKEEPER_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).toString()); +props.setProperty(socket.timeout.ms,
[jira] [Commented] (NIFI-733) GetKafka group identifier is ignored
[ https://issues.apache.org/jira/browse/NIFI-733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613188#comment-14613188 ] ASF subversion and git services commented on NIFI-733: -- Commit 786bc1d61260e2d8558747ca206d360aebdd1994 in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=786bc1d ] NIFI-733: Make use of Client Name, Zookeeper Timeout, Kafka Timeout properties and add new Group ID property GetKafka group identifier is ignored Key: NIFI-733 URL: https://issues.apache.org/jira/browse/NIFI-733 Project: Apache NiFi Issue Type: Bug Components: Extensions Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 Attachments: 0001-NIFI-733-Make-use-of-Client-Name-Zookeeper-Timeout-K.patch A NiFi user reported that the GetKafka processor has a group identifier feature that doesn't work as expected. After initial code review it appears the group identifier property that a user can set is ignored which appears to be a bug. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-749) Unit tests fail on Windows for InvokeHTTP
[ https://issues.apache.org/jira/browse/NIFI-749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613214#comment-14613214 ] Matt Gilman commented on NIFI-749: -- +1 Looks good. Unit tests fail on Windows for InvokeHTTP - Key: NIFI-749 URL: https://issues.apache.org/jira/browse/NIFI-749 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.2.0 Reporter: Mark Payne Priority: Blocker Fix For: 0.2.0 Attachments: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-472) When running NiFi with the run.as property specified in the bootstrap.conf file, the run.as user should own the nifi.pid file
[ https://issues.apache.org/jira/browse/NIFI-472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613215#comment-14613215 ] Mark Payne commented on NIFI-472: - Applied patch. Ran on CentOS 7. All seems to work well. Ran the application as root with run.as set to mark and then was able to stop the application as myself. Verified that I owned the file and that permissions were 600. +1 When running NiFi with the run.as property specified in the bootstrap.conf file, the run.as user should own the nifi.pid file --- Key: NIFI-472 URL: https://issues.apache.org/jira/browse/NIFI-472 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Mark Payne Assignee: Aldrin Piri Fix For: 0.2.0 Attachments: 0001-NIFI-472-Refining-the-mechanism-to-carry-out-running.patch Currently, if I set the run.as user to something like nifi and then I run bin/nifi.sh start, a file named nifi.pid is created in the bin/ directory, but it is owned by me. It should instead be owned by the run.as user (nifi). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-679) InvokeHTTP - Add support for basic authentication
[ https://issues.apache.org/jira/browse/NIFI-679?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613179#comment-14613179 ] Matt Gilman commented on NIFI-679: -- Looks good... Thanks! InvokeHTTP - Add support for basic authentication - Key: NIFI-679 URL: https://issues.apache.org/jira/browse/NIFI-679 Project: Apache NiFi Issue Type: Improvement Components: Extensions Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: nifi-679.patch InvokeHTTP should optionally support username/password for web services that do not employ certificate based authentication. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-732) GetKafka if stopped then started doesn't resume pulling messages
[ https://issues.apache.org/jira/browse/NIFI-732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613169#comment-14613169 ] Mark Payne commented on NIFI-732: - [~brianghig] I'd be hesitant to remove the timeouts. We should probably make proper use of them. The issue with removing them is that if it never gets a response, and the user clicks Stop, the processor will never stop. It will just sit and wait indefinitely to finish reading from the socket. GetKafka if stopped then started doesn't resume pulling messages Key: NIFI-732 URL: https://issues.apache.org/jira/browse/NIFI-732 Project: Apache NiFi Issue Type: Bug Components: Extensions Environment: linux Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 A nifi user reported that they had to restart nifi to get the GetKafka processor to resume pulling data once they had stopped the processor. Upon restarting it showed that it was started but did not resume pulling data. Need to attempt to reproduce and resolve. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (NIFI-733) GetKafka group identifier is ignored
[ https://issues.apache.org/jira/browse/NIFI-733?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne updated NIFI-733: Attachment: 0001-NIFI-733-Make-use-of-Client-Name-Zookeeper-Timeout-K.patch GetKafka group identifier is ignored Key: NIFI-733 URL: https://issues.apache.org/jira/browse/NIFI-733 Project: Apache NiFi Issue Type: Bug Components: Extensions Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 Attachments: 0001-NIFI-733-Make-use-of-Client-Name-Zookeeper-Timeout-K.patch A NiFi user reported that the GetKafka processor has a group identifier feature that doesn't work as expected. After initial code review it appears the group identifier property that a user can set is ignored which appears to be a bug. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-733) GetKafka group identifier is ignored
[ https://issues.apache.org/jira/browse/NIFI-733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613184#comment-14613184 ] Aldrin Piri commented on NIFI-733: -- Build and contrib are good, addressing property being ignored. +1 GetKafka group identifier is ignored Key: NIFI-733 URL: https://issues.apache.org/jira/browse/NIFI-733 Project: Apache NiFi Issue Type: Bug Components: Extensions Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 Attachments: 0001-NIFI-733-Make-use-of-Client-Name-Zookeeper-Timeout-K.patch A NiFi user reported that the GetKafka processor has a group identifier feature that doesn't work as expected. After initial code review it appears the group identifier property that a user can set is ignored which appears to be a bug. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[2/2] incubator-nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi 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/b1718494 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b1718494 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b1718494 Branch: refs/heads/develop Commit: b1718494679c83a61e4f37976a58b29caba8b00f Parents: 9d6458a 063afe2 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Fri Jul 3 09:09:15 2015 -0400 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Fri Jul 3 09:09:15 2015 -0400 -- nifi-site/src/includes/topbar.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[jira] [Commented] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613228#comment-14613228 ] Matt Gilman commented on NIFI-745: -- [~markap14] I agree with the desired behavior and agree that it would address this issue. I suppose the only thing in question is whether we can introduce this change as part of a minor increment. The API is not changing however, the behavior regarding when OnDisabled is invoked is. Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-732) GetKafka if stopped then started doesn't resume pulling messages
[ https://issues.apache.org/jira/browse/NIFI-732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613172#comment-14613172 ] Mark Payne commented on NIFI-732: - Actually, it looks like if not set it defaults to 6 seconds. This is far better than waiting indefinitely. I could see wanting a longer timeout than 6 seconds, though. GetKafka if stopped then started doesn't resume pulling messages Key: NIFI-732 URL: https://issues.apache.org/jira/browse/NIFI-732 Project: Apache NiFi Issue Type: Bug Components: Extensions Environment: linux Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 A nifi user reported that they had to restart nifi to get the GetKafka processor to resume pulling data once they had stopped the processor. Upon restarting it showed that it was started but did not resume pulling data. Need to attempt to reproduce and resolve. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-743) .getSolr-mock-processor and .httpCache-mock-processor files in conf dir
[ https://issues.apache.org/jira/browse/NIFI-743?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613217#comment-14613217 ] Bryan Bende commented on NIFI-743: -- I think if OnRemoved won't be called, then Mark's suggestion to avoid creating the files all together is the way to go... so moving the code that creates the files from OnShutdown to OnStopped should work. Adding the OnRemoved methods that clean up is still a good thing, since it will clean up when processors are removed while the application is running, but maybe it should be a separate ticket? .getSolr-mock-processor and .httpCache-mock-processor files in conf dir --- Key: NIFI-743 URL: https://issues.apache.org/jira/browse/NIFI-743 Project: Apache NiFi Issue Type: Bug Components: Tools and Build Reporter: Mark Payne Assignee: Bryan Bende Fix For: 0.2.0 Attachments: NIFI-743.patch I'm not sure where these are coming from but when I do a clean build, I'm ending up with 2 files in the conf/ directory that shouldn't be there: .httpCache-mock-processor and .getSolr-mock-processor. Not sure if these were created when I did the build or when I launched the application, but either way they shouldn't be there. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[2/2] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi 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/322ac6fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/322ac6fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/322ac6fb Branch: refs/heads/develop Commit: 322ac6fba6bec0e691b29cea74af7a93572677a5 Parents: 786bc1d b171849 Author: Mark Payne marka...@hotmail.com Authored: Fri Jul 3 09:38:19 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 09:38:19 2015 -0400 -- .../nifi/processors/standard/InvokeHTTP.java| 46 +++- .../processors/standard/TestInvokeHTTP.java | 109 +++ 2 files changed, 154 insertions(+), 1 deletion(-) --
[jira] [Commented] (NIFI-732) GetKafka if stopped then started doesn't resume pulling messages
[ https://issues.apache.org/jira/browse/NIFI-732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613191#comment-14613191 ] Mark Payne commented on NIFI-732: - I went ahead and addressed the timeouts (and all other properties that were exposed and not used :( ) in NIFI-733. GetKafka if stopped then started doesn't resume pulling messages Key: NIFI-732 URL: https://issues.apache.org/jira/browse/NIFI-732 Project: Apache NiFi Issue Type: Bug Components: Extensions Environment: linux Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 A nifi user reported that they had to restart nifi to get the GetKafka processor to resume pulling data once they had stopped the processor. Upon restarting it showed that it was started but did not resume pulling data. Need to attempt to reproduce and resolve. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (NIFI-749) Unit tests fail on Windows for InvokeHTTP
Mark Payne created NIFI-749: --- Summary: Unit tests fail on Windows for InvokeHTTP Key: NIFI-749 URL: https://issues.apache.org/jira/browse/NIFI-749 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.2.0 Reporter: Mark Payne Priority: Blocker Fix For: 0.2.0 Attachments: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (NIFI-749) Unit tests fail on Windows for InvokeHTTP
[ https://issues.apache.org/jira/browse/NIFI-749?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne updated NIFI-749: Attachment: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch Unit tests fail on Windows for InvokeHTTP - Key: NIFI-749 URL: https://issues.apache.org/jira/browse/NIFI-749 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.2.0 Reporter: Mark Payne Priority: Blocker Fix For: 0.2.0 Attachments: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-472: Refining the mechanism to carry out running as a different user pushing the handling of this primarily to the controlling script rather than the Java code. Making
Repository: incubator-nifi Updated Branches: refs/heads/develop 322ac6fba - 136974af7 NIFI-472: Refining the mechanism to carry out running as a different user pushing the handling of this primarily to the controlling script rather than the Java code. Making changes to the assembly such that permissions are provided on a group level control basis. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/136974af Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/136974af Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/136974af Branch: refs/heads/develop Commit: 136974af7c63bdb8c4c99c1a02c6b34011e2e17f Parents: 322ac6f Author: Aldrin Piri ald...@apache.org Authored: Thu Jul 2 17:44:03 2015 -0400 Committer: Aldrin Piri ald...@apache.org Committed: Fri Jul 3 10:39:40 2015 -0400 -- nifi/nifi-assembly/pom.xml | 5 + .../src/main/assembly/dependencies.xml | 16 +++ .../java/org/apache/nifi/bootstrap/RunNiFi.java | 14 + .../src/main/resources/bin/nifi.sh | 21 ++-- 4 files changed, 33 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/136974af/nifi/nifi-assembly/pom.xml -- diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml index 9b17617..c679d22 100644 --- a/nifi/nifi-assembly/pom.xml +++ b/nifi/nifi-assembly/pom.xml @@ -35,6 +35,11 @@ language governing permissions and limitations under the License. -- /goals phasepackage/phase configuration +archiverConfig + defaultDirectoryMode0775/defaultDirectoryMode +directoryMode0775/directoryMode +fileMode0664/fileMode +/archiverConfig descriptors descriptorsrc/main/assembly/dependencies.xml/descriptor /descriptors http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/136974af/nifi/nifi-assembly/src/main/assembly/dependencies.xml -- diff --git a/nifi/nifi-assembly/src/main/assembly/dependencies.xml b/nifi/nifi-assembly/src/main/assembly/dependencies.xml index a3e3a18..243d0ac 100644 --- a/nifi/nifi-assembly/src/main/assembly/dependencies.xml +++ b/nifi/nifi-assembly/src/main/assembly/dependencies.xml @@ -29,8 +29,8 @@ scoperuntime/scope useProjectArtifactfalse/useProjectArtifact outputDirectorylib/outputDirectory -directoryMode0750/directoryMode -fileMode0640/fileMode +directoryMode0770/directoryMode +fileMode0660/fileMode useTransitiveFilteringtrue/useTransitiveFiltering excludes excludenifi-bootstrap/exclude @@ -44,8 +44,8 @@ scoperuntime/scope useProjectArtifactfalse/useProjectArtifact outputDirectorylib/bootstrap/outputDirectory -directoryMode0750/directoryMode -fileMode0640/fileMode +directoryMode0770/directoryMode +fileMode0660/fileMode useTransitiveFilteringtrue/useTransitiveFiltering includes includenifi-bootstrap/include @@ -59,8 +59,8 @@ scoperuntime/scope useProjectArtifactfalse/useProjectArtifact outputDirectory.//outputDirectory -directoryMode0750/directoryMode -fileMode0640/fileMode +directoryMode0770/directoryMode +fileMode0664/fileMode useTransitiveFilteringtrue/useTransitiveFiltering includes includenifi-resources/include @@ -79,8 +79,8 @@ scoperuntime/scope useProjectArtifactfalse/useProjectArtifact outputDirectory.//outputDirectory -directoryMode0750/directoryMode -fileMode0750/fileMode +directoryMode0770/directoryMode +fileMode0770/fileMode useTransitiveFilteringtrue/useTransitiveFiltering includes includenifi-resources/include http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/136974af/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java -- diff --git a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
[jira] [Commented] (NIFI-472) When running NiFi with the run.as property specified in the bootstrap.conf file, the run.as user should own the nifi.pid file
[ https://issues.apache.org/jira/browse/NIFI-472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613223#comment-14613223 ] ASF subversion and git services commented on NIFI-472: -- Commit 136974af7c63bdb8c4c99c1a02c6b34011e2e17f in incubator-nifi's branch refs/heads/develop from [~aldrin] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=136974a ] NIFI-472: Refining the mechanism to carry out running as a different user pushing the handling of this primarily to the controlling script rather than the Java code. Making changes to the assembly such that permissions are provided on a group level control basis. When running NiFi with the run.as property specified in the bootstrap.conf file, the run.as user should own the nifi.pid file --- Key: NIFI-472 URL: https://issues.apache.org/jira/browse/NIFI-472 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Mark Payne Assignee: Aldrin Piri Fix For: 0.2.0 Attachments: 0001-NIFI-472-Refining-the-mechanism-to-carry-out-running.patch Currently, if I set the run.as user to something like nifi and then I run bin/nifi.sh start, a file named nifi.pid is created in the bin/ directory, but it is owned by me. It should instead be owned by the run.as user (nifi). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (NIFI-743) .getSolr-mock-processor and .httpCache-mock-processor files in conf dir
[ https://issues.apache.org/jira/browse/NIFI-743?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bryan Bende updated NIFI-743: - Attachment: NIFI-743-2.patch .getSolr-mock-processor and .httpCache-mock-processor files in conf dir --- Key: NIFI-743 URL: https://issues.apache.org/jira/browse/NIFI-743 Project: Apache NiFi Issue Type: Bug Components: Tools and Build Reporter: Mark Payne Assignee: Bryan Bende Fix For: 0.2.0 Attachments: NIFI-743-2.patch, NIFI-743.patch I'm not sure where these are coming from but when I do a clean build, I'm ending up with 2 files in the conf/ directory that shouldn't be there: .httpCache-mock-processor and .getSolr-mock-processor. Not sure if these were created when I did the build or when I launched the application, but either way they shouldn't be there. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-749) Unit tests fail on Windows for InvokeHTTP
[ https://issues.apache.org/jira/browse/NIFI-749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613307#comment-14613307 ] ASF subversion and git services commented on NIFI-749: -- Commit 74b48009376e950bfa455be31e15f13cde7d27b9 in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=74b4800 ] NIFI-749: Ignore line endings in unit test Unit tests fail on Windows for InvokeHTTP - Key: NIFI-749 URL: https://issues.apache.org/jira/browse/NIFI-749 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.2.0 Reporter: Mark Payne Priority: Blocker Fix For: 0.2.0 Attachments: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613317#comment-14613317 ] Mark Payne commented on NIFI-745: - [~mcgilman] I think it's really a bit of a gray area. However, the consequences of how it works now are pretty terrible. And it's unlikely that someone really wants the behavior of being called repeatedly in the event that the services throws the exception. The invoking of the method is run in a background thread, so if someone does need that behavior, they could certainly implement the method to catch the Exception, sleep for a bit, and retry. So I would vote that we go ahead and change it. Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (NIFI-738) Do not write conversion error messages to flow file content
[ https://issues.apache.org/jira/browse/NIFI-738?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne resolved NIFI-738. - Resolution: Fixed Do not write conversion error messages to flow file content --- Key: NIFI-738 URL: https://issues.apache.org/jira/browse/NIFI-738 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.1.0 Reporter: Ryan Blue Assignee: Ryan Blue Fix For: 0.2.0 NIFI-551 extended the error handling provided by the ConvertJSONToAvro processor, but wrote error messages as the content of a file sent on the failure relationship. I think the right thing to do is to output the bad records as the file content and put the error messages in the outgoing attributes. NIFI-551 wasn't included in 0.1.0, so changing this behavior is safe. Consequently, I'd like to get this fix into 0.2.0. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613405#comment-14613405 ] Aldrin Piri commented on NIFI-745: -- Had one check style error: [WARNING] src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java[41] (regexp) RegexpSinglelineJava: Line has trailing whitespace. [ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.15:check (check-style) on project nifi-api: You have 1 Checkstyle violation. - [Help 1] Otherwise, all looks good, +1 Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Attachments: 0001-NIFI-745-Only-call-methods-with-OnDisabled-once-rega.patch Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (NIFI-717) nifi-bootstrap.log written to directory relative to current working directory
[ https://issues.apache.org/jira/browse/NIFI-717?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne updated NIFI-717: Attachment: 0001-NIFI-717-Set-working-directory-to-NIFI_HOME-before-r.patch nifi-bootstrap.log written to directory relative to current working directory - Key: NIFI-717 URL: https://issues.apache.org/jira/browse/NIFI-717 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: 0001-NIFI-717-Set-working-directory-to-NIFI_HOME-before-r.patch It appears that nifi-bootstrap.log is written to a directory that is relative to the current working directory. If NiFi is launched from outside $NIFI_HOME the logs end up outside of $NIFI_HOME. It is confusing since its configured to be written to logs/ just like nifi-app.log and nifi-user.log but it is written to logs/ in a different location. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-717) nifi-bootstrap.log written to directory relative to current working directory
[ https://issues.apache.org/jira/browse/NIFI-717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613356#comment-14613356 ] ASF subversion and git services commented on NIFI-717: -- Commit a2b9d70ac43f6f3162abb7706f9021ce3e3993f0 in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=a2b9d70 ] NIFI-717: Set working directory to $NIFI_HOME before running starting nifi in linux nifi-bootstrap.log written to directory relative to current working directory - Key: NIFI-717 URL: https://issues.apache.org/jira/browse/NIFI-717 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: 0001-NIFI-717-Set-working-directory-to-NIFI_HOME-before-r.patch It appears that nifi-bootstrap.log is written to a directory that is relative to the current working directory. If NiFi is launched from outside $NIFI_HOME the logs end up outside of $NIFI_HOME. It is confusing since its configured to be written to logs/ just like nifi-app.log and nifi-user.log but it is written to logs/ in a different location. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[1/2] incubator-nifi git commit: NIFI-717: Set working directory to $NIFI_HOME before running starting nifi in linux
Repository: incubator-nifi Updated Branches: refs/heads/develop 63a900852 - f3b55d46d NIFI-717: Set working directory to $NIFI_HOME before running starting nifi in linux Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a2b9d70a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a2b9d70a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a2b9d70a Branch: refs/heads/develop Commit: a2b9d70ac43f6f3162abb7706f9021ce3e3993f0 Parents: 8da7327 Author: Mark Payne marka...@hotmail.com Authored: Fri Jul 3 13:33:06 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 13:33:06 2015 -0400 -- .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a2b9d70a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh -- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh index 01a3f81..86e97d8 100755 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh @@ -183,9 +183,9 @@ run() { # run 'start' in the background because the process will continue to run, monitoring NiFi. # all other commands will terminate quickly so want to just wait for them if [ $1 = start ]; then -(${sudo_cmd_prefix} $JAVA -cp $NIFI_HOME/conf/:$NIFI_HOME/lib/bootstrap/* -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file=$BOOTSTRAP_CONF org.apache.nifi.bootstrap.RunNiFi $@ ) +(cd $NIFI_HOME ${sudo_cmd_prefix} $JAVA -cp $NIFI_HOME/conf/:$NIFI_HOME/lib/bootstrap/* -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file=$BOOTSTRAP_CONF org.apache.nifi.bootstrap.RunNiFi $@ ) else -${sudo_cmd_prefix} $JAVA -cp $NIFI_HOME/conf/:$NIFI_HOME/lib/bootstrap/* -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file=$BOOTSTRAP_CONF org.apache.nifi.bootstrap.RunNiFi $@ +(cd $NIFI_HOME ${sudo_cmd_prefix} $JAVA -cp $NIFI_HOME/conf/:$NIFI_HOME/lib/bootstrap/* -Xms12m -Xmx24m -Dorg.apache.nifi.bootstrap.config.file=$BOOTSTRAP_CONF org.apache.nifi.bootstrap.RunNiFi $@) fi # Wait just a bit (3 secs) to wait for the logging to finish and then echo a new-line.
[jira] [Commented] (NIFI-717) nifi-bootstrap.log written to directory relative to current working directory
[ https://issues.apache.org/jira/browse/NIFI-717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613357#comment-14613357 ] ASF subversion and git services commented on NIFI-717: -- Commit f3b55d46d6a374ee27b2decb3ee7284fd294a10d in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=f3b55d4 ] Merge branch 'NIFI-717' into develop nifi-bootstrap.log written to directory relative to current working directory - Key: NIFI-717 URL: https://issues.apache.org/jira/browse/NIFI-717 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: 0001-NIFI-717-Set-working-directory-to-NIFI_HOME-before-r.patch It appears that nifi-bootstrap.log is written to a directory that is relative to the current working directory. If NiFi is launched from outside $NIFI_HOME the logs end up outside of $NIFI_HOME. It is confusing since its configured to be written to logs/ just like nifi-app.log and nifi-user.log but it is written to logs/ in a different location. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-749) Unit tests fail on Windows for InvokeHTTP
[ https://issues.apache.org/jira/browse/NIFI-749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613366#comment-14613366 ] Joe Skora commented on NIFI-749: Sorry about that, I'll make sure to test on all 3 environments next time. Unit tests fail on Windows for InvokeHTTP - Key: NIFI-749 URL: https://issues.apache.org/jira/browse/NIFI-749 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.2.0 Reporter: Mark Payne Priority: Blocker Fix For: 0.2.0 Attachments: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-735) DocGenerator should call @OnShutdown after its done generating the docs
[ https://issues.apache.org/jira/browse/NIFI-735?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613385#comment-14613385 ] Matt Gilman commented on NIFI-735: -- Looks good! +1 DocGenerator should call @OnShutdown after its done generating the docs --- Key: NIFI-735 URL: https://issues.apache.org/jira/browse/NIFI-735 Project: Apache NiFi Issue Type: Bug Components: Core Framework Affects Versions: 0.1.0 Reporter: Dan Bress Assignee: Dan Bress Fix For: 0.2.0 Attachments: 0001-Squashed-commit-of-the-following.patch Per [~mcgilman] +0 for triggering OnRemoved and OnShutdown after initialization and before being done with instance +0 for triggering OnRemoved and OnShutdown and not their deprecated counterparts Change code to call annotations *after* the documentation has been generated for that component. Also invoke both the new annotations and the deprecated annotations. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (NIFI-734) GetKafka Kafka Timeout property is ignored
[ https://issues.apache.org/jira/browse/NIFI-734?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne resolved NIFI-734. - Resolution: Duplicate Fix Version/s: 0.2.0 This issue was addressed in NIFI-733. There were a few properties that were ignored; they were all addressed in NIFI-733. GetKafka Kafka Timeout property is ignored -- Key: NIFI-734 URL: https://issues.apache.org/jira/browse/NIFI-734 Project: Apache NiFi Issue Type: Bug Components: Extensions Reporter: Brian Ghigiarelli Fix For: 0.2.0 The GetKafka processor has a Kafka Timeout property feature that doesn't work as expected. This property should likely be passed to the Kafka Consumer properties as consumer.timeout.ms, but it is instead ignored. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-743 Moving OnShutdown to OnStopped for GetSolr and GetHttp
Repository: incubator-nifi Updated Branches: refs/heads/develop 8da732718 - 63a900852 NIFI-743 Moving OnShutdown to OnStopped for GetSolr and GetHttp Adding OnRemoved methods to GetSolr and GetHttp Signed-off-by: Mark Payne marka...@hotmail.com Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/63a90085 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/63a90085 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/63a90085 Branch: refs/heads/develop Commit: 63a900852769bbd7bedc2b460a291a9de0bd9a15 Parents: 8da7327 Author: Bryan Bende bbe...@apache.org Authored: Fri Jul 3 10:52:35 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 13:37:44 2015 -0400 -- .../apache/nifi/processors/solr/GetSolr.java| 15 -- .../nifi/processors/solr/TestGetSolr.java | 29 +--- .../nifi/processors/standard/GetHTTP.java | 15 -- .../nifi/processors/standard/TestGetHTTP.java | 10 +-- 4 files changed, 56 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/63a90085/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java -- diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java index 6344e2c..ff264a1 100644 --- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java +++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java @@ -21,7 +21,8 @@ package org.apache.nifi.processors.solr; import org.apache.commons.io.IOUtils; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; -import org.apache.nifi.annotation.lifecycle.OnShutdown; +import org.apache.nifi.annotation.lifecycle.OnRemoved; +import org.apache.nifi.annotation.lifecycle.OnStopped; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.logging.ProcessorLog; @@ -157,11 +158,19 @@ public class GetSolr extends SolrProcessor { lastEndDatedRef.set(UNINITIALIZED_LAST_END_DATE_VALUE); } -@OnShutdown -public void onShutdown() { +@OnStopped +public void onStopped() { writeLastEndDate(); } +@OnRemoved +public void onRemoved() { +final File lastEndDateCache = new File(FILE_PREFIX + getIdentifier()); +if (lastEndDateCache.exists()) { +lastEndDateCache.delete(); +} +} + @Override public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException { final ProcessorLog logger = getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/63a90085/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java -- diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java index b0f5e68..d8f6423 100644 --- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java +++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestGetSolr.java @@ -104,14 +104,15 @@ public class TestGetSolr { File confDir = new File(conf); assertTrue(confDir.exists()); File[] files = confDir.listFiles(); -assertTrue(files.length 0); -for (File file : files) { -assertTrue(Failed to delete + file.getName(), file.delete()); +if (files.length 0) { +for (File file : files) { +assertTrue(Failed to delete + file.getName(), file.delete()); +} } assertTrue(confDir.delete()); try { -solrClient.shutdown(); +solrClient.close(); } catch (Exception e) { } } @@ -184,6 +185,26 @@ public class TestGetSolr { runner.assertAllFlowFilesTransferred(GetSolr.REL_SUCCESS, 0); } +@Test +public void testOnRemovedRemovesState() throws IOException, SolrServerException { +
[jira] [Commented] (NIFI-743) .getSolr-mock-processor and .httpCache-mock-processor files in conf dir
[ https://issues.apache.org/jira/browse/NIFI-743?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613351#comment-14613351 ] ASF subversion and git services commented on NIFI-743: -- Commit 63a900852769bbd7bedc2b460a291a9de0bd9a15 in incubator-nifi's branch refs/heads/develop from [~bbende] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=63a9008 ] NIFI-743 Moving OnShutdown to OnStopped for GetSolr and GetHttp Adding OnRemoved methods to GetSolr and GetHttp Signed-off-by: Mark Payne marka...@hotmail.com .getSolr-mock-processor and .httpCache-mock-processor files in conf dir --- Key: NIFI-743 URL: https://issues.apache.org/jira/browse/NIFI-743 Project: Apache NiFi Issue Type: Bug Components: Tools and Build Reporter: Mark Payne Assignee: Bryan Bende Fix For: 0.2.0 Attachments: NIFI-743-2.patch, NIFI-743.patch I'm not sure where these are coming from but when I do a clean build, I'm ending up with 2 files in the conf/ directory that shouldn't be there: .httpCache-mock-processor and .getSolr-mock-processor. Not sure if these were created when I did the build or when I launched the application, but either way they shouldn't be there. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613407#comment-14613407 ] Mark Payne commented on NIFI-745: - Thanks, Aldrin. Good catch, I did forget to run the contrib-check profile. Fixed the issue and pushed. Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Attachments: 0001-NIFI-745-Only-call-methods-with-OnDisabled-once-rega.patch Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613406#comment-14613406 ] ASF subversion and git services commented on NIFI-745: -- Commit 208402472dd99c629afc056f4464b925b8f834ab in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=2084024 ] NIFI-745: Only call methods with @OnDisabled once, regardless of whether or not they succeed Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Attachments: 0001-NIFI-745-Only-call-methods-with-OnDisabled-once-rega.patch Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-685) Proxy Support for GetHTTP and PostHTTP processors
[ https://issues.apache.org/jira/browse/NIFI-685?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613320#comment-14613320 ] ASF subversion and git services commented on NIFI-685: -- Commit 2a4e5e12855364c6d4b14f1ef1445e08d1f4fe08 in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=2a4e5e1 ] NIFI-685: Fixed checkstyle violation of using import with * Proxy Support for GetHTTP and PostHTTP processors - Key: NIFI-685 URL: https://issues.apache.org/jira/browse/NIFI-685 Project: Apache NiFi Issue Type: Improvement Components: Core Framework Affects Versions: 0.2.0 Reporter: Andrew Hulbert Priority: Minor Fix For: 0.2.0 Add http web proxy support to GetHTTP and PostHTTP processors. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-685) Proxy Support for GetHTTP and PostHTTP processors
[ https://issues.apache.org/jira/browse/NIFI-685?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613321#comment-14613321 ] ASF GitHub Bot commented on NIFI-685: - Github user markap14 commented on the pull request: https://github.com/apache/incubator-nifi/pull/67#issuecomment-118393376 Code looks good, and I have verified that the original functionality still works as designed, so that's good enough for me. Merged to develop. Thanks! Proxy Support for GetHTTP and PostHTTP processors - Key: NIFI-685 URL: https://issues.apache.org/jira/browse/NIFI-685 Project: Apache NiFi Issue Type: Improvement Components: Core Framework Affects Versions: 0.2.0 Reporter: Andrew Hulbert Priority: Minor Fix For: 0.2.0 Add http web proxy support to GetHTTP and PostHTTP processors. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Payne updated NIFI-745: Attachment: 0001-NIFI-745-Only-call-methods-with-OnDisabled-once-rega.patch Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Attachments: 0001-NIFI-745-Only-call-methods-with-OnDisabled-once-rega.patch Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-732) GetKafka if stopped then started doesn't resume pulling messages
[ https://issues.apache.org/jira/browse/NIFI-732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613413#comment-14613413 ] Mark Payne commented on NIFI-732: - [~brianghig] I am not able to duplicate this issue. Any insight as to how to duplicate the issue? GetKafka if stopped then started doesn't resume pulling messages Key: NIFI-732 URL: https://issues.apache.org/jira/browse/NIFI-732 Project: Apache NiFi Issue Type: Bug Components: Extensions Environment: linux Reporter: Joseph Witt Assignee: Mark Payne Fix For: 0.2.0 A nifi user reported that they had to restart nifi to get the GetKafka processor to resume pulling data once they had stopped the processor. Upon restarting it showed that it was started but did not resume pulling data. Need to attempt to reproduce and resolve. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[4/4] incubator-nifi git commit: NIFI-685: Fixed checkstyle violation of using import with *
NIFI-685: Fixed checkstyle violation of using import with * Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2a4e5e12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2a4e5e12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2a4e5e12 Branch: refs/heads/develop Commit: 2a4e5e12855364c6d4b14f1ef1445e08d1f4fe08 Parents: 2ac61c5 Author: Mark Payne marka...@hotmail.com Authored: Fri Jul 3 12:55:32 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 12:55:32 2015 -0400 -- .../nifi/processors/standard/PostHTTP.java | 30 +++- 1 file changed, 17 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2a4e5e12/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java -- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java index 1dc7aba..51f28e0 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java @@ -49,7 +49,11 @@ import javax.net.ssl.SSLSession; import javax.security.cert.X509Certificate; import javax.servlet.http.HttpServletResponse; -import org.apache.http.*; +import org.apache.http.Header; +import org.apache.http.HttpException; +import org.apache.http.HttpHost; +import org.apache.http.HttpResponse; +import org.apache.http.HttpResponseInterceptor; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.CredentialsProvider; @@ -78,9 +82,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpCoreContext; import org.apache.http.util.EntityUtils; +import org.apache.nifi.annotation.behavior.ReadsAttribute; import org.apache.nifi.annotation.behavior.SupportsBatching; import org.apache.nifi.annotation.documentation.CapabilityDescription; -import org.apache.nifi.annotation.behavior.ReadsAttribute; import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnScheduled; import org.apache.nifi.annotation.lifecycle.OnStopped; @@ -378,7 +382,7 @@ public class PostHTTP extends AbstractProcessor { config = new Config(conMan); final Config existingConfig = configMap.putIfAbsent(baseUrl, config); -return (existingConfig == null) ? config : existingConfig; +return existingConfig == null ? config : existingConfig; } private SSLContext createSSLContext(final SSLContextService service) @@ -402,7 +406,7 @@ public class PostHTTP extends AbstractProcessor { builder = builder.loadKeyMaterial(keystore, service.getKeyStorePassword().toCharArray()); } -SSLContext sslContext = builder.build(); +final SSLContext sslContext = builder.build(); return sslContext; } @@ -468,13 +472,13 @@ public class PostHTTP extends AbstractProcessor { clientBuilder.addInterceptorFirst(new HttpResponseInterceptor() { @Override public void process(final HttpResponse response, final HttpContext httpContext) throws HttpException, IOException { -HttpCoreContext coreContext = HttpCoreContext.adapt(httpContext); -ManagedHttpClientConnection conn = coreContext.getConnection(ManagedHttpClientConnection.class); +final HttpCoreContext coreContext = HttpCoreContext.adapt(httpContext); +final ManagedHttpClientConnection conn = coreContext.getConnection(ManagedHttpClientConnection.class); if (!conn.isOpen()) { return; } -SSLSession sslSession = conn.getSSLSession(); +final SSLSession sslSession = conn.getSSLSession(); if (sslSession != null) { final X509Certificate[] certChain = sslSession.getPeerCertificateChain(); @@ -524,7 +528,7 @@ public class PostHTTP extends AbstractProcessor { }
[3/4] incubator-nifi git commit: Adding a plain socket factory for use with regular proxies
Adding a plain socket factory for use with regular proxies Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2ac61c59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2ac61c59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2ac61c59 Branch: refs/heads/develop Commit: 2ac61c5972d30eb3840ca6d4066f14f87e5adb00 Parents: 05772a0 Author: Andrew Hulbert andrew.hulb...@ccri.com Authored: Mon Jun 8 15:29:14 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 12:48:46 2015 -0400 -- .../java/org/apache/nifi/processors/standard/GetHTTP.java| 8 +++- .../java/org/apache/nifi/processors/standard/PostHTTP.java | 8 +++- 2 files changed, 14 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2ac61c59/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java -- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java index 6e9acdd..1ecd170 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java @@ -62,6 +62,7 @@ import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.conn.ssl.SSLContexts; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; @@ -358,7 +359,12 @@ public class GetHTTP extends AbstractSessionFactoryProcessor { final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new String[]{TLSv1}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); -final RegistryConnectionSocketFactory socketFactoryRegistry = RegistryBuilder.ConnectionSocketFactorycreate().register(https, sslsf).build(); +// Also include a plain socket factory for regular http connections (especially proxies) +final RegistryConnectionSocketFactory socketFactoryRegistry = +RegistryBuilder.ConnectionSocketFactorycreate() +.register(https, sslsf) +.register(http, PlainConnectionSocketFactory.getSocketFactory()) +.build(); conMan = new BasicHttpClientConnectionManager(socketFactoryRegistry); } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2ac61c59/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java -- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java index 98056cb..1dc7aba 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java @@ -64,6 +64,7 @@ import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.conn.ManagedHttpClientConnection; import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.SSLContexts; @@ -362,7 +363,12 @@ public class PostHTTP extends AbstractProcessor { final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new String[]{TLSv1}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); -final RegistryConnectionSocketFactory socketFactoryRegistry = RegistryBuilder.ConnectionSocketFactorycreate().register(https,
[2/4] incubator-nifi git commit: newline
newline Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/05772a07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/05772a07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/05772a07 Branch: refs/heads/develop Commit: 05772a07cf9a8c14143d805c9698634326d5024f Parents: 159615b Author: Andrew Hulbert andrew.hulb...@ccri.com Authored: Fri Jun 5 23:32:59 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 12:48:45 2015 -0400 -- .../main/java/org/apache/nifi/processors/standard/PostHTTP.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/05772a07/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java -- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java index 31b5698..98056cb 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java @@ -504,7 +504,7 @@ public class PostHTTP extends AbstractProcessor { final int port = context.getProperty(PROXY_PORT).asInteger(); clientBuilder.setProxy(new HttpHost(host, port)); } - + client = clientBuilder.build(); // determine whether or not destination accepts flowfile/gzip
[1/4] incubator-nifi git commit: initial proxy server commit
Repository: incubator-nifi Updated Branches: refs/heads/develop 74b480093 - 2a4e5e128 initial proxy server commit Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/159615bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/159615bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/159615bb Branch: refs/heads/develop Commit: 159615bb8e6ca6e48a8418e9059874cdd4b4eee1 Parents: 74b4800 Author: Andrew Hulbert andrew.hulb...@ccri.com Authored: Fri Jun 5 23:10:16 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 12:48:44 2015 -0400 -- .../nifi/processors/standard/GetHTTP.java | 30 .../nifi/processors/standard/PostHTTP.java | 36 +--- 2 files changed, 61 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/159615bb/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java -- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java index 0001bb3..6e9acdd 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java @@ -50,6 +50,7 @@ import java.util.regex.Pattern; import javax.net.ssl.SSLContext; import org.apache.http.Header; +import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; @@ -171,6 +172,18 @@ public class GetHTTP extends AbstractSessionFactoryProcessor { .required(false) .identifiesControllerService(SSLContextService.class) .build(); +public static final PropertyDescriptor PROXY_HOST = new PropertyDescriptor.Builder() +.name(Proxy Host) +.description(The fully qualified hostname or IP address of the proxy server) +.required(false) +.addValidator(StandardValidators.NON_EMPTY_VALIDATOR) +.build(); +public static final PropertyDescriptor PROXY_PORT = new PropertyDescriptor.Builder() +.name(Proxy Port) +.description(The port of the proxy server) +.required(false) +.addValidator(StandardValidators.PORT_VALIDATOR) +.build(); public static final Relationship REL_SUCCESS = new Relationship.Builder() .name(success) @@ -222,6 +235,8 @@ public class GetHTTP extends AbstractSessionFactoryProcessor { properties.add(USER_AGENT); properties.add(ACCEPT_CONTENT_TYPE); properties.add(FOLLOW_REDIRECTS); +properties.add(PROXY_HOST); +properties.add(PROXY_PORT); this.properties = Collections.unmodifiableList(properties); // load etag and lastModified from file @@ -276,6 +291,14 @@ public class GetHTTP extends AbstractSessionFactoryProcessor { .build()); } +if (context.getProperty(PROXY_HOST).isSet() !context.getProperty(PROXY_PORT).isSet()) { +results.add(new ValidationResult.Builder() +.explanation(Proxy Host was set but no Proxy Port was specified) +.valid(false) +.subject(Proxy server configuration) +.build()); +} + return results; } @@ -378,6 +401,13 @@ public class GetHTTP extends AbstractSessionFactoryProcessor { clientBuilder.setDefaultCredentialsProvider(credentialsProvider); } +// Set the proxy if specified +if (context.getProperty(PROXY_HOST).isSet() context.getProperty(PROXY_PORT).isSet()) { +final String host = context.getProperty(PROXY_HOST).getValue(); +final int port = context.getProperty(PROXY_PORT).asInteger(); +clientBuilder.setProxy(new HttpHost(host, port)); +} + // create the http client final HttpClient client = clientBuilder.build(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/159615bb/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
incubator-nifi git commit: NIFI-720: Ensure that if Reporting Task stopped while @OnScheduled method is failing that it does not start running when configuration is fixed
Repository: incubator-nifi Updated Branches: refs/heads/develop 2a4e5e128 - 8da732718 NIFI-720: Ensure that if Reporting Task stopped while @OnScheduled method is failing that it does not start running when configuration is fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8da73271 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8da73271 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8da73271 Branch: refs/heads/develop Commit: 8da7327188ebdb3cbadda257429e4967be07bf77 Parents: 2a4e5e1 Author: Mark Payne marka...@hotmail.com Authored: Tue Jun 23 16:23:01 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 13:14:16 2015 -0400 -- .../scheduling/StandardProcessScheduler.java| 74 - .../TestStandardProcessScheduler.java | 107 +++ .../src/test/resources/nifi.properties | 2 +- 3 files changed, 154 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8da73271/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java -- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java index cf644ed..d976bd0 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java @@ -174,31 +174,45 @@ public final class StandardProcessScheduler implements ProcessScheduler { @SuppressWarnings(deprecation) @Override public void run() { +final long lastStopTime = scheduleState.getLastStopTime(); +final ReportingTask reportingTask = taskNode.getReportingTask(); + // Continually attempt to start the Reporting Task, and if we fail sleep for a bit each time. while (true) { -final ReportingTask reportingTask = taskNode.getReportingTask(); - try { -try (final NarCloseable x = NarCloseable.withNarLoader()) { - ReflectionUtils.invokeMethodsWithAnnotations(OnScheduled.class, OnConfigured.class, reportingTask, taskNode.getConfigurationContext()); -} +synchronized (scheduleState) { +// if no longer scheduled to run, then we're finished. This can happen, for example, +// if the @OnScheduled method throws an Exception and the user stops the reporting task +// while we're administratively yielded. +// we also check if the schedule state's last start time is equal to what it was before. +// if not, then means that the reporting task has been stopped and started again, so we should just +// bail; another thread will be responsible for invoking the @OnScheduled methods. +if (!scheduleState.isScheduled() || scheduleState.getLastStopTime() != lastStopTime) { +return; +} + +try (final NarCloseable x = NarCloseable.withNarLoader()) { + ReflectionUtils.invokeMethodsWithAnnotations(OnScheduled.class, OnConfigured.class, reportingTask, taskNode.getConfigurationContext()); +} -break; +agent.schedule(taskNode, scheduleState); +return; +} } catch (final Exception e) { final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e; final ComponentLog componentLog = new SimpleProcessLogger(reportingTask.getIdentifier(), reportingTask); componentLog.error(Failed to invoke @OnEnabled method due to {}, cause); -LOG.error(Failed to invoke the On-Scheduled Lifecycle methods of {} due to {}; administratively yielding this
[jira] [Commented] (NIFI-720) If Reporting Task fails to start properly and is then stopped, it can continue to run once it is able to start
[ https://issues.apache.org/jira/browse/NIFI-720?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613329#comment-14613329 ] ASF subversion and git services commented on NIFI-720: -- Commit 8da7327188ebdb3cbadda257429e4967be07bf77 in incubator-nifi's branch refs/heads/develop from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=8da7327 ] NIFI-720: Ensure that if Reporting Task stopped while @OnScheduled method is failing that it does not start running when configuration is fixed If Reporting Task fails to start properly and is then stopped, it can continue to run once it is able to start -- Key: NIFI-720 URL: https://issues.apache.org/jira/browse/NIFI-720 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Mark Payne Assignee: Mark Payne Fix For: 0.2.0 Attachments: 0001-NIFI-720-Ensure-that-if-Reporting-Task-stopped-while.patch Steps to replicate: Create a MonitorMemory reporting task. Set an invalid value for the Memory Pool Start the reporting task See that errors are logged indicating that it couldn't start properly Stop Reporting Task Change Memory Pool to a valid value MonitorMemory will begin to run. Clicking Start will cause two threads to now run. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-745) Disabling Controller Service stuck
[ https://issues.apache.org/jira/browse/NIFI-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613354#comment-14613354 ] Matt Gilman commented on NIFI-745: -- [~markap14] Agreed. Disabling Controller Service stuck -- Key: NIFI-745 URL: https://issues.apache.org/jira/browse/NIFI-745 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Fix For: 0.2.0 Per the nifi-api a controller service OnDisable method will be invoked when the user disables that service. If that method fails with an exception it will be retried a short time later. This will continue until it successfully completes. Unfortunately, this means that if services continually throws an exception during OnDisable the user will not be able to do anything with the service. This is because controller services need to be Disabled in order to support editing its configuration or attempting to Enable. The service in question will not transition to the Disabled state until its OnDisable completes without issue. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[2/2] incubator-nifi git commit: Merge branch 'NIFI-717' into develop
Merge branch 'NIFI-717' 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/f3b55d46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f3b55d46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f3b55d46 Branch: refs/heads/develop Commit: f3b55d46d6a374ee27b2decb3ee7284fd294a10d Parents: 63a9008 a2b9d70 Author: Mark Payne marka...@hotmail.com Authored: Fri Jul 3 13:50:43 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 13:50:43 2015 -0400 -- .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[jira] [Commented] (NIFI-743) .getSolr-mock-processor and .httpCache-mock-processor files in conf dir
[ https://issues.apache.org/jira/browse/NIFI-743?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613355#comment-14613355 ] Mark Payne commented on NIFI-743: - Code looks good. Confirmed that build is okay, all unit tests pass. The files are no longer appearing in the conf/ directory. +1 Thanks for knocking this out! .getSolr-mock-processor and .httpCache-mock-processor files in conf dir --- Key: NIFI-743 URL: https://issues.apache.org/jira/browse/NIFI-743 Project: Apache NiFi Issue Type: Bug Components: Tools and Build Reporter: Mark Payne Assignee: Bryan Bende Fix For: 0.2.0 Attachments: NIFI-743-2.patch, NIFI-743.patch I'm not sure where these are coming from but when I do a clean build, I'm ending up with 2 files in the conf/ directory that shouldn't be there: .httpCache-mock-processor and .getSolr-mock-processor. Not sure if these were created when I did the build or when I launched the application, but either way they shouldn't be there. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-717) nifi-bootstrap.log written to directory relative to current working directory
[ https://issues.apache.org/jira/browse/NIFI-717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613353#comment-14613353 ] Matt Gilman commented on NIFI-717: -- +1 Looks good. Verified logs directory gets created in NIFI_HOME and not based off the current working directory. nifi-bootstrap.log written to directory relative to current working directory - Key: NIFI-717 URL: https://issues.apache.org/jira/browse/NIFI-717 Project: Apache NiFi Issue Type: Bug Components: Core Framework Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: 0001-NIFI-717-Set-working-directory-to-NIFI_HOME-before-r.patch It appears that nifi-bootstrap.log is written to a directory that is relative to the current working directory. If NiFi is launched from outside $NIFI_HOME the logs end up outside of $NIFI_HOME. It is confusing since its configured to be written to logs/ just like nifi-app.log and nifi-user.log but it is written to logs/ in a different location. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-745: Only call methods with @OnDisabled once, regardless of whether or not they succeed
Repository: incubator-nifi Updated Branches: refs/heads/develop f3b55d46d - 208402472 NIFI-745: Only call methods with @OnDisabled once, regardless of whether or not they succeed Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/20840247 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/20840247 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/20840247 Branch: refs/heads/develop Commit: 208402472dd99c629afc056f4464b925b8f834ab Parents: f3b55d4 Author: Mark Payne marka...@hotmail.com Authored: Fri Jul 3 14:35:59 2015 -0400 Committer: Mark Payne marka...@hotmail.com Committed: Fri Jul 3 15:00:31 2015 -0400 -- .../nifi/annotation/lifecycle/OnDisabled.java | 10 ++--- .../scheduling/StandardProcessScheduler.java| 39 +--- 2 files changed, 22 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/20840247/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java -- diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java index f205bc7..f8ca038 100644 --- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java +++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java @@ -36,11 +36,11 @@ import org.apache.nifi.controller.ConfigurationContext; * Methods using this annotation are permitted to take zero arguments or to take * a single argument of type {@link ConfigurationContext}. If a method with this * annotation throws a Throwable, a log message and bulletin will be issued for - * the service, and the service will remain in a 'DISABLING' state. When this - * occurs, the method with this annotation will be called again after some - * period of time. This will continue until the method returns without throwing - * any Throwable. Until that time, the service will remain in a 'DISABLING' - * state and cannot be enabled again. + * the service, but the service will still be marked as Disabled. The failing + * method will not be called again until the service is enabled and disabled again. + * This is done in order to prevent a ControllerService from continually failing + * in such a way that the service could not be disabled and updated without + * restarting the instance of NiFi. * /p * * p http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/20840247/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java -- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java index d976bd0..5ac4a0b 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java @@ -685,33 +685,28 @@ public final class StandardProcessScheduler implements ProcessScheduler { try (final NarCloseable x = NarCloseable.withNarLoader()) { final ConfigurationContext configContext = new StandardConfigurationContext(service, controllerServiceProvider, null); -while (true) { -try { - ReflectionUtils.invokeMethodsWithAnnotation(OnDisabled.class, service.getControllerServiceImplementation(), configContext); -heartbeater.heartbeat(); -service.setState(ControllerServiceState.DISABLED); -return; -} catch (final Exception e) { -final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e; -final ComponentLog componentLog = new SimpleProcessLogger(service.getIdentifier(), service); -componentLog.error(Failed to invoke @OnDisabled method due to {}, cause); - -LOG.error(Failed to invoke @OnDisabled method of {} due to {}, service.getControllerServiceImplementation(),
[jira] [Commented] (NIFI-749) Unit tests fail on Windows for InvokeHTTP
[ https://issues.apache.org/jira/browse/NIFI-749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14613368#comment-14613368 ] Mark Payne commented on NIFI-749: - [~jskora] no worries, that's one of the great things about apache land. Lots of people testing in lots of different environments. Thanks for the contribution! Unit tests fail on Windows for InvokeHTTP - Key: NIFI-749 URL: https://issues.apache.org/jira/browse/NIFI-749 Project: Apache NiFi Issue Type: Bug Components: Extensions Affects Versions: 0.2.0 Reporter: Mark Payne Priority: Blocker Fix For: 0.2.0 Attachments: 0001-NIFI-749-Ignore-line-endings-in-unit-test.patch -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (NIFI-679) InvokeHTTP - Add support for basic authentication
[ https://issues.apache.org/jira/browse/NIFI-679?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joe Skora updated NIFI-679: --- Attachment: nifi-679.patch Proposed patch file to incorporate Basic Authentication support into the InvokeHTTP processor. InvokeHTTP - Add support for basic authentication - Key: NIFI-679 URL: https://issues.apache.org/jira/browse/NIFI-679 Project: Apache NiFi Issue Type: Improvement Components: Extensions Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: nifi-679.patch InvokeHTTP should optionally support username/password for web services that do not employ certificate based authentication. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-679) InvokeHTTP - Add support for basic authentication
[ https://issues.apache.org/jira/browse/NIFI-679?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612881#comment-14612881 ] Joe Skora commented on NIFI-679: I have attached a proposed patch for Basic Auth in InvokeHTTP. InvokeHTTP - Add support for basic authentication - Key: NIFI-679 URL: https://issues.apache.org/jira/browse/NIFI-679 Project: Apache NiFi Issue Type: Improvement Components: Extensions Reporter: Matt Gilman Priority: Minor Fix For: 0.2.0 Attachments: nifi-679.patch InvokeHTTP should optionally support username/password for web services that do not employ certificate based authentication. -- This message was sent by Atlassian JIRA (v6.3.4#6332)