-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
Improved Client handling of failed RPCs #4106
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ca3b13e
randomize servers
dadgar 12ec2e3
RPC Retry Watcher
dadgar 46e6d70
Spelling error
dadgar 80c380b
Fire retry only when consul discovers new servers
dadgar 12a8655
Scale heartbeat retrying based on remaining heartbeat time
dadgar c86ad8f
Handle no leader and faster retries near limit
dadgar 231f052
changelog
dadgar 9ce59c5
more jitter
dadgar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,6 +74,16 @@ func (s *Server) String() string { | |
return s.addr | ||
} | ||
|
||
func (s *Server) Equal(o *Server) bool { | ||
if s == nil && o == nil { | ||
return true | ||
} else if s == nil && o != nil || s != nil && o == nil { | ||
return false | ||
} | ||
|
||
return s.Addr.String() == o.Addr.String() && s.DC == o.DC | ||
} | ||
|
||
type Servers []*Server | ||
|
||
func (s Servers) String() string { | ||
|
@@ -160,6 +170,9 @@ func (m *Manager) Start() { | |
func (m *Manager) SetServers(servers Servers) { | ||
m.Lock() | ||
defer m.Unlock() | ||
|
||
// Randomize the incoming servers | ||
servers.shuffle() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you still want to shuffle if they're equal? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah otherwise we will have deterministic ordering through Consul discovery. |
||
m.servers = servers | ||
} | ||
|
||
|
@@ -204,7 +217,7 @@ func (m *Manager) NotifyFailedServer(s *Server) { | |
// If the server being failed is not the first server on the list, | ||
// this is a noop. If, however, the server is failed and first on | ||
// the list, move the server to the end of the list. | ||
if len(m.servers) > 1 && m.servers[0] == s { | ||
if len(m.servers) > 1 && m.servers[0].Equal(s) { | ||
m.servers.cycle() | ||
} | ||
} | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can be shortened to
if s == nil || o == nil { return s == o }
h/t to @chelseakomlo