Pre-resolve upstreams and skip nginx configtest.
#312
Merged
Conversation
This file contains 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
ssalinas
reviewed
Jun 17, 2019
| } else if (upstream instanceof UpstreamInfo) { | ||
| UpstreamInfo upstreamInfo = ((UpstreamInfo) upstream); | ||
| LOG.trace("Trying to resolve an UpstreamInfo upstream of {} with upstreamInfo.getResolvedUpstream() = {}, resolver.resolveUpstreamDNS(upstreamInfo.getUpstream()) = {}, upstreamInfo.getUpstream() = {}", upstreamInfo, upstreamInfo | ||
| .getResolvedUpstream(), resolver.resolveUpstreamDNS(upstreamInfo.getUpstream()), upstreamInfo.getUpstream()); |
There was a problem hiding this comment.
Looks like this trace line will cause us to call resolveUpstreamDNS twice rather than one and storing in a variable for logging.
ssalinas
reviewed
Jun 17, 2019
| return Optional.of(String.format("%s:%d", ip, port)); | ||
| } else { | ||
| try { | ||
| InetAddresses.forString(address); |
There was a problem hiding this comment.
is there a reason we don't try using the cache if it doesn't contain a :?
There was a problem hiding this comment.
I carried this code over from ResolveUpstreamHelper, but now you mention it, I don't see a reason for that. Gonna fix that 👍
ssalinas
reviewed
Jun 17, 2019
| && allUpstreamsAreResolved(maybeResolvedRemoveUpstreams) | ||
| && allUpstreamsAreResolved(maybeResolvedReplaceUpstreams)) { | ||
| LOG.trace("Request {} does not change a BaragonService and all upstreams were pre-resolved. Setting noValidate.", nonServiceChangeRequest.request.getQueuedRequestId().getRequestId()); | ||
| BaragonRequest requestWithResolvedUpstreams = new BaragonRequestBuilder() |
There was a problem hiding this comment.
is it worth making a toBuilder on BaragonRequest?
There was a problem hiding this comment.
Probs, yeah. There's a lot of copy boilerplate at the moment
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.
No description provided.