GitHub user justinleet opened a pull request:
https://github.com/apache/metron/pull/1040
METRON-1589: '/api/v1/search/search' fails when 'Solr Zookeeper Urls' has
comma separated multiple zookeeper urls
## Contributor Comments
Refactored `SolrDao` to kill `getZkHost` and made it `getZkHosts` and
return a `List`. `getSolrClient` now takes a `List<String>`, and passes it down.
I also added a `getSolrClient` method that's just blank, and defers to the
`getZkHosts` method. Our calls to `getSolrClient` are generally
`solrDao.getSolrClient(solrDao.getZkHosts)`, which seems unnecessary. I did not
however, change everything to use that, but I could definitely be persuaded to
as part of this.
Additionally, `SolrColumnMetadataDao` now takes a` SolrClient` instead of a
Zookeeper host string, to make it consistent with the other DAOs.
There's one catch however: I haven't integration tested this, because I'd
need multiple Zk nodes and we don't really have a clean way to get it (neither
the `SolrComponent` or `ZkComponent` really let you do it). I'm not sure if we
want or need those tests, or if alternatively we want to spin up a multinode
environment and manually test, or if we're fine just assuming things line up
(given that it's really testing if the underlying method works as expected at
this point). There are unit tests agains the methods to ensure splitting is
handled properly in the methods.
## Pull Request Checklist
Thank you for submitting a contribution to Apache Metron.
Please refer to our [Development
Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235)
for the complete guide to follow for contributions.
Please refer also to our [Build Verification
Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview)
for complete smoke testing guides.
In order to streamline the review of the contribution we ask you follow
these guidelines and ask you to double check the following:
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? If not one needs to
be created at [Metron
Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
- [x] Does your PR title start with METRON-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)?
### For code changes:
- [x] Have you included steps to reproduce the behavior or problem that is
being changed or addressed?
- [x] Have you included steps or a guide to how the change may be verified
and tested manually?
- [ ] Have you ensured that the full suite of tests and checks have been
executed in the root metron folder via:
```
mvn -q clean integration-test install &&
dev-utilities/build-utils/verify_licenses.sh
```
- [x] Have you written or updated unit tests and or integration tests to
verify your changes?
- [x] 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)?
- [x] Have you verified the basic functionality of the build by building
and running locally with Vagrant full-dev environment or the equivalent?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in
which it is rendered by building and verifying the site-book? If not then run
the following commands and the verify changes via
`site-book/target/site/index.html`:
```
cd site-book
mvn site
```
#### 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.
It is also recommended that [travis-ci](https://travis-ci.org) is set up
for your personal repository such that your branches are built there before
submitting a pull request.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/justinleet/metron commaSeparatedZK
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/1040.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 #1040
----
commit f2dcec68269db86f9e53f931e4e5e000a1626432
Author: justinjleet <justinjleet@...>
Date: 2018-05-25T13:40:10Z
Initial change
----
---
