archive-gh-me/gitpod
1
0
Fork 0
mirror of https://github.com/gitpod-io/gitpod.git synced 2025-12-08 17:36:30 +00:00
Code Issues Projects Releases Wiki Activity

[ws-proxy] Don't leak workspace info Go routines

Browse Source
This commit is contained in:
Christian Weichel 2021-01-19 09:25:02 +00:00
parent 1ac8fbeef3
commit 396b51ed1f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/ws-proxy/pkg/proxy/infoprovider.go
View File

@ -275,8 +275,15 @@ func mapWorkspaceStatusToInfo(status *wsapi.WorkspaceStatus) *WorkspaceInfo {
} }
} }
// WorkspaceInfo return the WorkspaceInfo avaiable for the given workspaceID // WorkspaceInfo return the WorkspaceInfo avaiable for the given workspaceID.
// Callers should make sure their context gets canceled properly. For good measure
// this function will timeout by itself as well.
func (p *RemoteWorkspaceInfoProvider) WorkspaceInfo(ctx context.Context, workspaceID string) *WorkspaceInfo { func (p *RemoteWorkspaceInfoProvider) WorkspaceInfo(ctx context.Context, workspaceID string) *WorkspaceInfo {
// In case the parent context does not cancel for some reason, we want to make sure
// we clean up after ourselves to not leak Go routines.
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
info, present := p.cache.WaitFor(ctx, workspaceID) info, present := p.cache.WaitFor(ctx, workspaceID)
if !present { if !present {
return nil return nil

5
components/ws-proxy/pkg/proxy/routes.go
View File

@ -482,10 +482,7 @@ func workspaceMustExistHandler(config *Config, infoProvider WorkspaceInfoProvide
return func(h http.Handler) http.Handler { return func(h http.Handler) http.Handler {
return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) { return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
coords := getWorkspaceCoords(req) coords := getWorkspaceCoords(req)
// it might take some time until the event comes in. Let's wait for it at most 3 secs. info := infoProvider.WorkspaceInfo(req.Context(), coords.ID)
ctx, cancel := context.WithTimeout(req.Context(), 3*time.Second)
defer cancel()
info := infoProvider.WorkspaceInfo(ctx, coords.ID)
if info == nil { if info == nil {
log.WithFields(log.OWI("", coords.ID, "")).Info("no workspace info found - redirecting to start") log.WithFields(log.OWI("", coords.ID, "")).Info("no workspace info found - redirecting to start")
redirectURL := fmt.Sprintf("%s://%s/start/#%s", config.GitpodInstallation.Scheme, config.GitpodInstallation.HostName, coords.ID) redirectURL := fmt.Sprintf("%s://%s/start/#%s", config.GitpodInstallation.Scheme, config.GitpodInstallation.HostName, coords.ID)