zds: fix retrying a bad netns #1284
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
howardjohn
added
the
release-notes-none
|
Skipping CI for Draft Pull Request. |
istio-testing
added
do-not-merge/work-in-progress
|
/test all |
howardjohn
force-pushed
the
zds/fix-retry-bad-netns
branch
from
2f4c915 to
5e90298
Compare
istio-testing
removed
the
do-not-merge/work-in-progress
bleggett
reviewed
Aug 28, 2024
| @@ -231,6 +231,8 @@ impl WorkloadProxyManagerState { | |||
| .await | |||
| { | |||
| Ok(()) => { | |||
| // If the workload is already pending, make sure we drop it, so we don't retry. | |||
| self.pending_workloads.remove(workload_uid); | |||
There was a problem hiding this comment.
I'm beginning to think we should probably key all of the workload stores with UID + NetNSID to avoid future goofiness like this.
There was a problem hiding this comment.
one nice part about UID is it means we will never have multiple Proxy running for a given pod. I would worry if we have netns ID as a key we could end up with some leaky Proxy instances somehow maybe?
Might be possible, but needs care
bleggett
added
the
cherrypick/release-1.23
|
In response to a cherrypick label: new pull request created: #1285 |
2 tasks
antonioberben
pushed a commit
to antonioberben/ztunnel
that referenced
this pull request
Oct 1, 2024
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.
Fixes istio/istio#52858
The issue here is this sequence of events:
Basically, we successfully start the proxy, but have the same UID in the pending queue. When the pending retries, it kills the working on + fails to start (since it has its own netns which is bogus).
The fix is to remove a proxy from pending queue when its added