-
Notifications
You must be signed in to change notification settings - Fork 3.4k
envoy: Wait for endpoint restoration before listening on xDS socket #35984
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
Merged
Conversation
This file contains hidden or 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
/test |
sayboras
approved these changes
Nov 14, 2024
9cb1867
to
86866f6
Compare
Rebased for a CI fix |
/test |
86866f6
to
594444e
Compare
/test |
Initialize daemon.endpointRestoreComplete channel early so that it is not possible for anyone to start waiting for it to get closed before it is initialized, as that would lead to them waiting forever (receive from a nil channel blocks forever). Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Delay listening on the Cilium xDS socket until endpoints have been restored. This eliminates the problem where Envoy times out on the initial fetch on the xDS streams. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
594444e
to
c2fd6c6
Compare
/test |
tommyp1ckles
approved these changes
Nov 16, 2024
restorer, err := s.restorerPromise.Await(ctx) | ||
if err == nil && restorer != nil { | ||
log.Infof("Envoy: Waiting for endpoint restoration before serving xDS resources...") | ||
err = restorer.WaitForEndpointRestore(ctx) |
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.
Quick question, to confirm - is this err value that is intended to be checked below against context.Canceled
?
This was referenced Nov 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area/proxy
Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers.
backport/author
The backport will be carried out by the author of the PR.
backport-done/1.16
The backport for Cilium 1.16.x for this PR is done.
kind/bug
This is a bug in the Cilium logic.
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
release-note/bug
This PR fixes an issue in a previous release of Cilium.
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.
Delay listening on the Cilium xDS socket until endpoints have been restored. This eliminates the problem where Envoy times out on the initial fetch on the xDS streams.