Reload Typha addresses between connection attempts. #7176
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
marvin-tigera
added
docs-pr-required
fasaxc
force-pushed
the
typha-discov-reload
branch
5 times, most recently
from
2bcfe6b
to
841bd24
Compare
fasaxc
added
docs-not-required
fasaxc
force-pushed
the
typha-discov-reload
branch
2 times, most recently
from
48ec750
to
8964e13
Compare
fasaxc
commented
Jan 17, 2023
| @@ -21,53 +21,128 @@ import ( | |||
| ) | |||
|
|
|||
| type Interface interface { | |||
| NodesClient | |||
There was a problem hiding this comment.
I split out these smaller interfaces to make mocking easier. Then I refactored the code and I didn't need to mock the NodeClient any more. Nevertheless, it seemed like a good idea to make mocking easier in future...
Rework Typha discovery: - Extract out a Discoverer object to keep track of state. - Replace loop over slice of Typhas with an object that handles refreshing the list of Typhas.
fasaxc
force-pushed
the
typha-discov-reload
branch
from
8964e13
to
5508fb5
Compare
electricjesus
approved these changes
Jan 17, 2023
typha/pkg/syncclient/sync_client.go
Outdated
|
|
||
| // Defensive: set a sanity limit in case NextAddr() keeps finding new Typha addresses. | ||
| maxTries := len(s.discoverer.CachedTyphaAddrs()) * 2 | ||
| if maxTries < 6 { |
There was a problem hiding this comment.
nit: 6 seems to be a reasonable number given we typically see 3 typhas.. I guess we could explain why it's currently 6 in a comment? and maybe making this configurable is going to be overkill, too
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.
Description
Rework Typha discovery to avoid a long timeout if we happen to race with a Typha upgrade. Previously we could:
This change makes sure that we reload the list of Typhas between calls:
Related issues/PRs
Todos
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*label.docs-pr-required: This change requires a change to the documentation that has not been completed yet.docs-completed: This change has all necessary documentation completed.docs-not-required: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*label.release-note-required: This PR has user-facing changes. Most PRs should have this label.release-note-not-required: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.