chore: fix workspace proxy flake (coder#8755)

coadler · web-flow · commit 2811ab62d0e1 · 2023-07-26T23:50:25.000Z
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -34,7 +34,7 @@ import (
 // forceWorkspaceProxyHealthUpdate forces an update of the proxy health.
 // This is useful when a proxy is created or deleted. Errors will be logged.
 func (api *API) forceWorkspaceProxyHealthUpdate(ctx context.Context) {
-	if err := api.ProxyHealth.ForceUpdate(ctx); err != nil && !xerrors.Is(err, context.Canceled) {
+	if err := api.ProxyHealth.ForceUpdate(ctx); err != nil && !database.IsQueryCanceledError(err) && !xerrors.Is(err, context.Canceled) {
 		api.Logger.Error(ctx, "force proxy health update", slog.Error(err))
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`// forceWorkspaceProxyHealthUpdate forces an update of the proxy health.`
`35`	`35`	`// This is useful when a proxy is created or deleted. Errors will be logged.`
`36`	`36`	`func (api *API) forceWorkspaceProxyHealthUpdate(ctx context.Context) {`
`37`		`- if err := api.ProxyHealth.ForceUpdate(ctx); err != nil && !xerrors.Is(err, context.Canceled) {`
	`37`	`+ if err := api.ProxyHealth.ForceUpdate(ctx); err != nil && !database.IsQueryCanceledError(err) && !xerrors.Is(err, context.Canceled) {`
`38`	`38`	`api.Logger.Error(ctx, "force proxy health update", slog.Error(err))`
`39`	`39`	`}`
`40`	`40`	`}`