Commit4066785

authored

fix: agentcontainers: fix flake when ctx cancelled while running docker inspect (#18526)

1 parentb091b99 commit4066785Copy full SHA for 4066785

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,11 @@ func (api *API) updaterLoop() {`
`378`	`378`	`// and anyone looking to interact with the API.`
`379`	`379`	`api.logger.Debug(api.ctx,"performing initial containers update")`
`380`	`380`	`iferr:=api.updateContainers(api.ctx);err!=nil {`
`381`		`-api.logger.Error(api.ctx,"initial containers update failed",slog.Error(err))`
	`381`	`+iferrors.Is(err,context.Canceled) {`
	`382`	`+api.logger.Warn(api.ctx,"initial containers update canceled",slog.Error(err))`
	`383`	`+}else {`
	`384`	`+api.logger.Error(api.ctx,"initial containers update failed",slog.Error(err))`
	`385`	`+}`
`382`	`386`	`}else {`
`383`	`387`	`api.logger.Debug(api.ctx,"initial containers update complete")`
`384`	`388`	`}`
`@@ -399,7 +403,11 @@ func (api *API) updaterLoop() {`
`399`	`403`	`caseapi.updateTrigger<-done:`
`400`	`404`	`err:=<-done`
`401`	`405`	`iferr!=nil {`
`402`		`-api.logger.Error(api.ctx,"updater loop ticker failed",slog.Error(err))`
	`406`	`+iferrors.Is(err,context.Canceled) {`
	`407`	`+api.logger.Warn(api.ctx,"updater loop ticker canceled",slog.Error(err))`
	`408`	`+}else {`
	`409`	`+api.logger.Error(api.ctx,"updater loop ticker failed",slog.Error(err))`
	`410`	`+}`
`403`	`411`	`}`
`404`	`412`	`default:`
`405`	`413`	`api.logger.Debug(api.ctx,"updater loop ticker skipped, update in progress")`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,10 @@ func (dcli *dockerCLI) List(ctx context.Context) (codersdk.WorkspaceAgentListCon`
`311`	`311`	`// container IDs and returns the parsed output.`
`312`	`312`	`// The stderr output is also returned for logging purposes.`
`313`	`313`	`funcrunDockerInspect(ctx context.Context,execer agentexec.Execer,ids...string) (stdout,stderr []byte,errerror) {`
	`314`	`+ifctx.Err()!=nil {`
	`315`	`+// If the context is done, we don't want to run the command.`
	`316`	`+return []byte{}, []byte{},ctx.Err()`
	`317`	`+}`
`314`	`318`	`varstdoutBuf,stderrBuf bytes.Buffer`
`315`	`319`	`cmd:=execer.CommandContext(ctx,"docker",append([]string{"inspect"},ids...)...)`
`316`	`320`	`cmd.Stdout=&stdoutBuf`
`@@ -319,6 +323,12 @@ func runDockerInspect(ctx context.Context, execer agentexec.Execer, ids ...strin`
`319`	`323`	`stdout=bytes.TrimSpace(stdoutBuf.Bytes())`
`320`	`324`	`stderr=bytes.TrimSpace(stderrBuf.Bytes())`
`321`	`325`	`iferr!=nil {`
	`326`	`+ifctx.Err()!=nil {`
	`327`	`+// If the context was canceled while running the command,`
	`328`	`+// return the context error instead of the command error,`
	`329`	`+// which is likely to be "signal: killed".`
	`330`	`+returnstdout,stderr,ctx.Err()`
	`331`	`+}`
`322`	`332`	`ifbytes.Contains(stderr, []byte("No such object:")) {`
`323`	`333`	`// This can happen if a container is deleted between the time we check for its existence and the time we inspect it.`
`324`	`334`	`returnstdout,stderr,nil`

Comments

(0)