Enable IPv6 URIs in reindex from remote #36874
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reindex from remote was using a custom regex to dermine what URIs were valid. This commit removes the custom regex and uses the java.net.URI class instead, allowing IPv6 support without changing the existing validation around a URI in reindex from remote.
hub-cap
added
>enhancement
v7.0.0
v6.7.0
:Distributed Indexing/CRUD
|
Pinging @elastic/es-distributed |
ywelsch
suggested changes
Dec 20, 2018
| String pathPrefix = hostMatcher.group("pathPrefix"); | ||
| int port = Integer.parseInt(hostMatcher.group("port")); | ||
|
|
||
| String scheme = uri.getScheme(); |
There was a problem hiding this comment.
also check that scheme is not null in the above validation?
There was a problem hiding this comment.
| int port = Integer.parseInt(hostMatcher.group("port")); | ||
|
|
||
| String scheme = uri.getScheme(); | ||
| String host = uri.getHost(); |
There was a problem hiding this comment.
same for host, check that it's not null?
There was a problem hiding this comment.
Ill add a null host check in RestReindexActionTests, but the URI wont parse if its null, so I dont have to add any code here.
There was a problem hiding this comment.
Added some tests in 4229f60
| int port = uri.getPort(); | ||
|
|
||
| String pathPrefix = null; | ||
| if (uri.getPath().isEmpty() == false) { |
There was a problem hiding this comment.
what if getPath returns null?
There was a problem hiding this comment.
there is an existing test that actually wants it to be null, so i wanted to keep that functionality. It used to return null in the regex, and now it was returning an empty string, so i kept the old functionality.
|
WRT testing |
hub-cap
added a commit
that referenced
this pull request
Dec 20, 2018
Reindex from remote was using a custom regex to dermine what URIs were valid. This commit removes the custom regex and uses the java.net.URI class instead, allowing IPv6 support without changing the existing validation around a URI in reindex from remote.
jasontedor
added a commit
to ywelsch/elasticsearch
that referenced
this pull request
Dec 21, 2018
* elastic/master: (539 commits) SQL: documentation improvements and updates (elastic#36918) [DOCS] Merges list of discovery and cluster formation settings (elastic#36909) Only compress responses if request was compressed (elastic#36867) Remove duplicate paragraph (elastic#36942) Fix URI to cluster stats endpoint on specific nodes (elastic#36784) Fix typo in unitTest task (elastic#36930) RecoveryMonitor#lastSeenAccessTime should be volatile (elastic#36781) [CCR] Add `ccr.auto_follow_coordinator.wait_for_timeout` setting (elastic#36714) Scripting: Remove deprecated params.ctx (elastic#36848) Refactor the REST actions to clarify what endpoints are deprecated. (elastic#36869) Add JDK 12 to CI rotation (elastic#36915) Improve error message for 6.x style realm settings (elastic#36876) Send clear session as routable remote request (elastic#36805) [DOCS] Remove redundant ILM attributes (elastic#36808) SQL: Fix bug regarding histograms usage in scripting (elastic#36866) Update index mappings when ccr restore complete (elastic#36879) Docs: Bump version to alpha2 after release Enable IPv6 URIs in reindex from remote (elastic#36874) Watcher: Remove unused local variable in doExecute (elastic#36655) [DOCS] Synchs titles of X-Pack APIs ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reindex from remote was using a custom regex to dermine what URIs were
valid. This commit removes the custom regex and uses the java.net.URI
class instead, allowing IPv6 support without changing the existing
validation around a URI in reindex from remote.