- Notifications
You must be signed in to change notification settings - Fork1k
chore: refactor DERP setting loop#15344
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
34 changes: 14 additions & 20 deletionscodersdk/workspacesdk/connector.go
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
2 changes: 0 additions & 2 deletionscodersdk/workspacesdk/connector_internal_test.go
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
81 changes: 81 additions & 0 deletionstailnet/controllers.go
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -359,3 +359,84 @@ func NewInMemoryCoordinatorClient( | ||
| ) | ||
| return c | ||
| } | ||
| type DERPMapSetter interface { | ||
| SetDERPMap(derpMap *tailcfg.DERPMap) | ||
| } | ||
| type basicDERPController struct { | ||
| logger slog.Logger | ||
| setter DERPMapSetter | ||
| } | ||
| func (b *basicDERPController) New(client DERPClient) CloserWaiter { | ||
| l := &derpSetLoop{ | ||
| logger: b.logger, | ||
| setter: b.setter, | ||
| client: client, | ||
| errChan: make(chan error, 1), | ||
| recvLoopDone: make(chan struct{}), | ||
| } | ||
| go l.recvLoop() | ||
| return l | ||
| } | ||
| func NewBasicDERPController(logger slog.Logger, setter DERPMapSetter) DERPController { | ||
| return &basicDERPController{ | ||
| logger: logger, | ||
| setter: setter, | ||
| } | ||
| } | ||
| type derpSetLoop struct { | ||
| logger slog.Logger | ||
| setter DERPMapSetter | ||
| client DERPClient | ||
| sync.Mutex | ||
| closed bool | ||
| errChan chan error | ||
| recvLoopDone chan struct{} | ||
| } | ||
| func (l *derpSetLoop) Close(ctx context.Context) error { | ||
ethanndickson marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| l.Lock() | ||
| defer l.Unlock() | ||
| if l.closed { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| case <-l.recvLoopDone: | ||
| return nil | ||
| } | ||
| } | ||
| l.closed = true | ||
| cErr := l.client.Close() | ||
| select { | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| case <-l.recvLoopDone: | ||
| return cErr | ||
| } | ||
| } | ||
| func (l *derpSetLoop) Wait() <-chan error { | ||
| return l.errChan | ||
| } | ||
| func (l *derpSetLoop) recvLoop() { | ||
| defer close(l.recvLoopDone) | ||
| for { | ||
| dm, err := l.client.Recv() | ||
| if err != nil { | ||
| l.logger.Debug(context.Background(), "failed to receive DERP message", slog.Error(err)) | ||
| select { | ||
| case l.errChan <- err: | ||
| default: | ||
| } | ||
| return | ||
| } | ||
| l.logger.Debug(context.Background(), "got new DERP Map", slog.F("derp_map", dm)) | ||
| l.setter.SetDERPMap(dm) | ||
| } | ||
| } | ||
70 changes: 70 additions & 0 deletionstailnet/controllers_test.go
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
18 changes: 18 additions & 0 deletionstailnet/convert.go
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
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.