You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2020/03/19 01:33:17 UTC
[GitHub] [nifi] mkazia opened a new pull request #4152: NIFI-7269 Upgrade
solrj version to 7 in nifi-solr-processors
mkazia opened a new pull request #4152: NIFI-7269 Upgrade solrj version to 7 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
#### Description of PR
_Upgrade solrj version to 7 in nifi-solr-processors; fixes bug NIFI-7269._
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [x] 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.
- [x] Has your PR been rebased against the latest commit within the target branch (typically `master`)?
- [ ] Is your initial contribution a single, squashed commit? _Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not `squash` or use `--force` when pushing to allow for clean monitoring of changes._
### For code changes:
- [x] Have you ensured that the full suite of tests is executed via `mvn -Pcontrib-check clean install` at the root `nifi` folder?
- [x] Have you written or updated unit tests to verify your changes?
- [ ] Have you verified that the full build is successful on both JDK 8 and JDK 11?
- [ ] 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`?
- [x] 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.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] mkazia commented on a change in pull request #4152:
NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
mkazia commented on a change in pull request #4152: NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#discussion_r397384797
##########
File path: nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/SolrUtils.java
##########
@@ -244,9 +246,17 @@ public static SolrClient createSolrClient(final PropertyContext context, final S
params.set(HttpClientUtil.PROP_MAX_CONNECTIONS, maxConnections);
params.set(HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST, maxConnectionsPerHost);
+ // CloudSolrClient.Builder now requires a List of ZK addresses and znode for solr as separate parameters
+ String zk[] = solrLocation.split("/");
+ final List zkList = Arrays.asList(zk[0].split(","));
+ String zkRoot = "/";
+ if (zk.length > 1 && ! zk[1].isEmpty()) {
+ zkRoot += zk[1];
+ }
+
Review comment:
@bbende thanks for the review. Yes you are right we should move it to else statement in 274. You can make the change as part of the merge. Thanks!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] bbende commented on a change in pull request #4152:
NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
bbende commented on a change in pull request #4152: NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#discussion_r397379074
##########
File path: nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/SolrUtils.java
##########
@@ -244,9 +246,17 @@ public static SolrClient createSolrClient(final PropertyContext context, final S
params.set(HttpClientUtil.PROP_MAX_CONNECTIONS, maxConnections);
params.set(HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST, maxConnectionsPerHost);
+ // CloudSolrClient.Builder now requires a List of ZK addresses and znode for solr as separate parameters
+ String zk[] = solrLocation.split("/");
+ final List zkList = Arrays.asList(zk[0].split(","));
+ String zkRoot = "/";
+ if (zk.length > 1 && ! zk[1].isEmpty()) {
+ zkRoot += zk[1];
+ }
+
Review comment:
I think we should move this ZK parsing block inside the else statement on line 274 where we know the Solr Type is CLOUD, just to be on the safer side since we wouldn't need to do this parsing when the type is STANDARD.
If you agree I can make this change as part of the merge.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] bbende commented on issue #4152: NIFI-7269 Upgrade solrj
version to 8 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
bbende commented on issue #4152: NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#issuecomment-603386257
Reviewing...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] asfgit closed pull request #4152: NIFI-7269 Upgrade solrj
version to 8 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #4152: NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] mkazia commented on issue #4152: NIFI-7269 Upgrade solrj
version to 7 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
mkazia commented on issue #4152: NIFI-7269 Upgrade solrj version to 7 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#issuecomment-601905376
The tests seems to be generating some files in the resources directory and it is not cleaning up the files afterwards, that is why the build is complaining about files without license. This is something new for solrj 8.x. I'll investigate on how to clean this up.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] mkazia commented on issue #4152: NIFI-7269 Upgrade solrj
version to 7 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
mkazia commented on issue #4152: NIFI-7269 Upgrade solrj version to 7 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#issuecomment-601954451
The build fail is unrelated to the change.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] bbende commented on issue #4152: NIFI-7269 Upgrade solrj
version to 8 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
bbende commented on issue #4152: NIFI-7269 Upgrade solrj version to 8 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#issuecomment-603443907
Going to make the change suggested above, everything else looks good, thanks @mkazia ! Will merge shortly
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [nifi] mkazia commented on issue #4152: NIFI-7269 Upgrade solrj
version to 7 in nifi-solr-processors
Posted by GitBox <gi...@apache.org>.
mkazia commented on issue #4152: NIFI-7269 Upgrade solrj version to 7 in nifi-solr-processors
URL: https://github.com/apache/nifi/pull/4152#issuecomment-601267941
I have tested this patch against Solr 7.4 and Solr 4.10 and it works for both versions without any issues.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services