You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by pvillard31 <gi...@git.apache.org> on 2017/09/01 10:15:52 UTC
[GitHub] nifi pull request #2121: NIFI-4343 - allow multiple URLs in SiteToSite repor...
GitHub user pvillard31 opened a pull request:
https://github.com/apache/nifi/pull/2121
NIFI-4343 - allow multiple URLs in SiteToSite reporting tasks
Thank you for submitting a contribution to Apache NiFi.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically master)?
- [ ] Is your initial contribution a single, squashed commit?
### For code changes:
- [ ] Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
- [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
- [ ] If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/pvillard31/nifi NIFI-4343
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/2121.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2121
----
commit 0c194f651f7e4998ab9a37870917a2875bdc072c
Author: Pierre Villard <pi...@gmail.com>
Date: 2017-09-01T10:14:51Z
NIFI-4343 - allow multiple URLs in SiteToSite reporting tasks
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #2121: NIFI-4343 - allow multiple URLs in SiteToSite repor...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/nifi/pull/2121
---
[GitHub] nifi issue #2121: NIFI-4343 - allow multiple URLs in SiteToSite reporting ta...
Posted by ijokarumawak <gi...@git.apache.org>.
Github user ijokarumawak commented on the issue:
https://github.com/apache/nifi/pull/2121
@pvillard31 I looked at the change briefly. I think we also need to change to use `new SiteToSiteClient.Builder().urls()` instead of `url()` here:
https://github.com/apache/nifi/blob/master/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java#L193
---
[GitHub] nifi pull request #2121: NIFI-4343 - allow multiple URLs in SiteToSite repor...
Posted by ijokarumawak <gi...@git.apache.org>.
Github user ijokarumawak commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2121#discussion_r145035152
--- Diff: nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java ---
@@ -190,7 +191,7 @@ public void reportEvent(final Severity severity, final String category, final St
context.getProperty(HTTP_PROXY_USERNAME).getValue(), context.getProperty(HTTP_PROXY_PASSWORD).getValue());
siteToSiteClient = new SiteToSiteClient.Builder()
- .url(destinationUrl)
+ .urls(SiteToSiteRestApiClient.parseClusterUrls(destinationUrl))
--- End diff --
This change just reminded me that `SiteToSiteRestApiClient.parseClusterUrls` also validates the destinationUrl. Probably it'd be a better approach to use `SiteToSiteRestApiClient.parseClusterUrls` and catch IllegalArgumentException from `NiFiUrlValidator.validate()`, instead of implementing different validation code there. How do you think?
---
[GitHub] nifi issue #2121: NIFI-4343 - allow multiple URLs in SiteToSite reporting ta...
Posted by pvillard31 <gi...@git.apache.org>.
Github user pvillard31 commented on the issue:
https://github.com/apache/nifi/pull/2121
Good catch @ijokarumawak and thanks for the review. Just pushed a commit to address your comment.
---
[GitHub] nifi pull request #2121: NIFI-4343 - allow multiple URLs in SiteToSite repor...
Posted by pvillard31 <gi...@git.apache.org>.
Github user pvillard31 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2121#discussion_r145396680
--- Diff: nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/AbstractSiteToSiteReportingTask.java ---
@@ -190,7 +191,7 @@ public void reportEvent(final Severity severity, final String category, final St
context.getProperty(HTTP_PROXY_USERNAME).getValue(), context.getProperty(HTTP_PROXY_PASSWORD).getValue());
siteToSiteClient = new SiteToSiteClient.Builder()
- .url(destinationUrl)
+ .urls(SiteToSiteRestApiClient.parseClusterUrls(destinationUrl))
--- End diff --
Realizing that this method is adding /nifi-api (or converting /nifi into /nifi-api). I changed the validator and updated the unit test accordingly.
---
[GitHub] nifi issue #2121: NIFI-4343 - allow multiple URLs in SiteToSite reporting ta...
Posted by ijokarumawak <gi...@git.apache.org>.
Github user ijokarumawak commented on the issue:
https://github.com/apache/nifi/pull/2121
@pvillard31 Thanks for the update. I've confirmed that SiteToSiteProvenanceReportingTask can use comma separated URLs, and stay being able to send events even if one of the remote NiFi instances specified at the URLs went down, and also the reporting task can resume sending while the remote node was down, by establishing S2S connection with other available node.
LGTM +1, I'm going to squash commits and merge to master. Thank you!
---