[supervisor] fix ports forwarding hangs issue #20841
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
mustard-mh
commented
May 26, 2025
| @@ -772,14 +778,14 @@ func (pm *Manager) Subscribe() (*Subscription, error) { | |||
| sub := &Subscription{updates: make(chan []*api.PortsStatus, 5)} | |||
| var once sync.Once | |||
| sub.Close = func() error { | |||
| pm.mu.Lock() | |||
There was a problem hiding this comment.
sub.Close and updateState both need mutex, which makes a dead lock
mustard-mh
commented
May 26, 2025
| requests: make(chan *exposePortRequest, 30), | ||
| localExposedNotice: make(chan struct{}, 30), | ||
| // allow clients to submit 3000 expose requests without blocking | ||
| requests: make(chan *exposePortRequest, 3000), |
There was a problem hiding this comment.
Ports expose requests more than 30 at the same time will make updateState hangs, and hold mutex forever
mustard-mh
force-pushed
the
hw/port-forwarding
branch
from
76d4f27 to
a720018
Compare
geropl
approved these changes
May 27, 2025
There was a problem hiding this comment.
Code changes LGTM, tests are green ✔️
Thank you for this fix @mustard-mh ! 🙏
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
Related Issue(s)
Fixes CLC-1313
How to test
for p in {1230..1270}; do python3 -m http.server $p & donegp ports listDocumentation
Preview status
Gitpod was successfully deployed to your preview environment.
Build Options
Build
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish
Installer
Add desired feature flags to the end of the line above, space separated
Preview Environment / Integration Tests
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Saves cost. Untick this only if you're really sure you need a non-preemtible machine.
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh. If enabled,with-previewandwith-large-vmwill be enabled./hold