(Go: >> BACK << -|- >> HOME <<)
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set noValidate if the request only removes upstreams and changes nothing else. #310

Merged
merged 27 commits into from
Jun 17, 2019
Merged

Set noValidate if the request only removes upstreams and changes nothing else. #310

merged 27 commits into from
Jun 17, 2019

Conversation

baconmania
Copy link
Contributor

No description provided.

ssalinas
ssalinas reviewed Jun 14, 2019
View reviewed changes
BaragonService/src/main/java/com/hubspot/baragon/service/worker/BaragonRequestWorker.java Outdated
@@ -302,6 +304,31 @@ public void run() {
}
}

private QueuedRequestWithState setNoValidateIfPossible(QueuedRequestWithState nonServiceChangeRequest) {
BaragonRequest originalRequest = nonServiceChangeRequest.getRequest();
if (originalRequest.getAddUpstreams().isEmpty() && originalRequest.getReplaceUpstreams().isEmpty() && !originalRequest.getRemoveUpstreams().isEmpty()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, but can we make this a nicely named method. Read the if statement 3 times before realizing there was a ! on the remove, lol. Maybe isOnlyUpstreamRemoval() or something?

baconmania and others added 26 commits June 14, 2019 12:10
@baconmania
Clarity.
d65963c
@baconmania
Logging.
c26454e
@baconmania
This doesn't belong here.
ae993e9
@baconmania
Update the request in ZK.
c4837de
@baconmania
Don't double-serialize.
e7a78e4
@baconmania
Add flag to pre-resolve upstream DNS, along with a builder for Barago…
2e04d6d 
…nService.
@baconmania
Centralize logic for resolving upstreams.
5d4044b
@baconmania
Optionally store a resolved IP on UpstreamInfo objects.
fc13474
@baconmania
Wire up centralized upstream resolution code.
34ebce0
@baconmania
Pre-resolve upstreams if configured to do so for the service.
ee0798d
@baconmania
Make casing match.
7b5447f
@baconmania
Logging.
ed05fa9
@baconmania
More logging.
9540460
@baconmania
address can have a port on it.
2631190
@baconmania
Yet more logging.
20a5e32
@baconmania
Check here for an IP even if there's no port.
bc94e58
@baconmania
Properly handle optionality here.
30d9383
@baconmania
Carry this through.
fe01495
@baconmania
Only write to ZK once, even if we adjust the request twice.
05e790b
@baconmania
Skip this logic if the request is already noValidate=true.
b991d63
@baconmania
Don't call resolveUpstreamDNS() twice.
641796e
@baconmania
Use the cache even if there's no port on the upstream.
a843edb
@baconmania
Account for replaceUpstreams as well.
d2176b6
@baconmania
Add a toBuilder() for brevity.
d47f402
@baconmania
Leave the previous constructor in place.
6c999b7
@baconmania
Merge pull request #312 from HubSpot/pre-resolve-upstreams
8dedacd 
Pre-resolve upstreams and skip `nginx configtest`.
@baconmania baconmania merged commit dac03d6 into master Jun 17, 2019
@baconmania baconmania deleted the set-noValidate-if-possible branch June 17, 2019 18:43
@baconmania baconmania added this to the 0.9.0 milestone Jun 17, 2019
@baconmania baconmania restored the set-noValidate-if-possible branch June 17, 2019 22:05
@ssalinas ssalinas deleted the set-noValidate-if-possible branch July 17, 2020 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ssalinas ssalinas ssalinas left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.9.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@baconmania @ssalinas