Use first available auth server #11229
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
zmb3
reviewed
Mar 17, 2022
espadolini
reviewed
Mar 17, 2022
| s := NewAuthProxyDialerService(nil, mockAuthGetter{servers: []types.Server{server1}}) | ||
| _, err = s.dialLocalAuthServer(context.Background()) | ||
| require.Error(t, err) | ||
| require.Equal(t, "all auth servers unavailable: invalid:8000: dial tcp: lookup invalid: no such host", err.Error()) |
There was a problem hiding this comment.
CI disagrees with this exact error; a bit of a moot point if you might change the error anyway, but I'd be a little lax on the exact error message - something along the lines of require.Contains(t, "all auth servers unavailable: invalid:8000", err.Error()) would be better.
| servers = append(servers, server) | ||
| } | ||
| s := NewAuthProxyDialerService(nil, mockAuthGetter{servers: servers}) | ||
| _, err = s.dialLocalAuthServer(context.Background()) |
There was a problem hiding this comment.
Won't this block indefinitely, because you're not actually accepting connections on your listener? Either way, pass a context with a timeout here.
There was a problem hiding this comment.
+1 for a short timeout
lib/srv/alpnproxy/auth/auth_proxy.go
Outdated
| authServerIndex := rand.Intn(len(authServers)) | ||
| var conn net.Conn | ||
| addr := authServers[authServerIndex].GetAddr() | ||
| conn, err = net.Dial("tcp", addr) |
There was a problem hiding this comment.
While we're touching this:
Suggested change
| conn, err = net.Dial("tcp", addr) | |
| var d net.Dialer | |
| conn, err = d.DialContext(ctx, "tcp", addr) |
codingllama
reviewed
Mar 17, 2022
| s := NewAuthProxyDialerService(nil, mockAuthGetter{servers: []types.Server{server1}}) | ||
| _, err = s.dialLocalAuthServer(context.Background()) | ||
| require.Error(t, err) | ||
| require.Equal(t, "all auth servers unavailable: invalid:8000: dial tcp: lookup invalid: no such host", err.Error()) |
| servers = append(servers, server) | ||
| } | ||
| s := NewAuthProxyDialerService(nil, mockAuthGetter{servers: servers}) | ||
| _, err = s.dialLocalAuthServer(context.Background()) |
There was a problem hiding this comment.
+1 for a short timeout
Co-authored-by: Edoardo Spadolini <[email protected]>
codingllama
approved these changes
Mar 17, 2022
espadolini
approved these changes
Mar 17, 2022
probakowski
added a commit
that referenced
this pull request
Mar 31, 2022
Currently we use random auth server from the list but if it's unavailable (for example it was restarted but there's still entry in cache, dynamodb backend etc) we return error. This change tries all servers (in random order) and uses first that is available. Closes #10019 (cherry picked from commit 35a9bbc)
probakowski
added a commit
that referenced
this pull request
Mar 31, 2022
Currently we use random auth server from the list but if it's unavailable (for example it was restarted but there's still entry in cache, dynamodb backend etc) we return error. This change tries all servers (in random order) and uses first that is available. Closes #10019 (cherry picked from commit 35a9bbc)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
probakowski
added a commit
that referenced
this pull request
Mar 31, 2022
Currently we use random auth server from the list but if it's unavailable (for example it was restarted but there's still entry in cache, dynamodb backend etc) we return error. This change tries all servers (in random order) and uses first that is available. Closes #10019 (cherry picked from commit 35a9bbc)
probakowski
added a commit
that referenced
this pull request
Mar 31, 2022
Currently we use random auth server from the list but if it's unavailable (for example it was restarted but there's still entry in cache, dynamodb backend etc) we return error. This change tries all servers (in random order) and uses first that is available. Closes #10019 (cherry picked from commit 35a9bbc)
Closed
Closed
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.
Currently we use random auth server from the list but if it's unavailable (for example it was restarted but there's still entry in cache, dynamodb backend etc) we return error.
This change tries all servers (in random order) and uses first that is available.
Closes #10019