Skip to content

chore: Implement workspace proxy going away (graceful shutdown) #7459

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.

Sign up for GitHub

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
merged 8 commits into from
May 11, 2023
Merged

chore: Implement workspace proxy going away (graceful shutdown) #7459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c4de6e
chore: Implement workspace proxy going away
Emyrk May 8, 2023
98a7740
Fix going away
Emyrk May 8, 2023
42f8154
Fix linting
Emyrk May 8, 2023
e572fef
Make gen
Emyrk May 8, 2023
5f9d216
Help test
Emyrk May 8, 2023
38eace7
Merge remote-tracking branch 'origin/main' into stevenmasley/proxy_go…
Emyrk May 10, 2023
2608bbc
Merge issues
Emyrk May 10, 2023
dbd37ac
fmt
Emyrk May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix going away
  • Loading branch information
@Emyrk
Emyrk committed May 8, 2023
commit 98a7740255ef6a3f28ff8bfdf8dcf7db8ed76e2d
11 changes: 6 additions & 5 deletions enterprise/wsproxy/wsproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,12 @@ func New(ctx context.Context, opts *Options) (*Server, error) {

func (s *Server) Close() error {
s.cancel()
go func() {
// Do this in a go routine to not block the close. This is allowed
// to fail, it is just a courtesy to the dashboard.
_ = s.SDKClient.WorkspaceProxyGoingAway(context.Background())
}()

// A timeout to prevent the SDK from blocking the server shutdown.
tmp, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()
_ = s.SDKClient.WorkspaceProxyGoingAway(tmp)

return s.AppServer.Close()
}

Expand Down
4 changes: 2 additions & 2 deletions site/src/api/typesGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,12 +1485,12 @@ export const ProvisionerTypes: ProvisionerType[] = ["echo", "terraform"]

// From codersdk/workspaceproxy.go
export type ProxyHealthStatus =
| "reachable"
| "ok"
| "unhealthy"
| "unreachable"
| "unregistered"
export const ProxyHealthStatuses: ProxyHealthStatus[] = [
"reachable",
"ok",
"unhealthy",
"unreachable",
"unregistered",
Expand Down