Commit0d86dca

authored

fix(codersdk): abort in-progress writes/reads when closing websocket (#12650)

Fixes#9203Related#12065Also, adds some basic tracing infrastructure that we can build upon for more improvements.

1 parent92aa1eb commit0d86dcaCopy full SHA for 0d86dca

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`"os/signal"`
`19`	`19`	`"path/filepath"`
`20`	`20`	`"runtime"`
	`21`	`+"runtime/trace"`
`21`	`22`	`"strings"`
`22`	`23`	`"syscall"`
`23`	`24`	`"text/tabwriter"`
`@@ -139,6 +140,22 @@ func (r RootCmd) AGPL() []serpent.Command {`
`139`	`140`
`140`	`141`	`// Main is the entrypoint for the Coder CLI.`
`141`	`142`	`func (rRootCmd)RunMain(subcommands []serpent.Command) {`
	`143`	`+// This configuration is not available as a standard option because we`
	`144`	`+// want to trace the entire program, including Options parsing.`
	`145`	`+goTraceFilePath,ok:=os.LookupEnv("CODER_GO_TRACE")`
	`146`	`+ifok {`
	`147`	`+traceFile,err:=os.OpenFile(goTraceFilePath,os.O_CREATE\|os.O_TRUNC\|os.O_WRONLY,0o644)`
	`148`	`+iferr!=nil {`
	`149`	`+panic(fmt.Sprintf("failed to open trace file: %v",err))`
	`150`	`+}`
	`151`	`+defertraceFile.Close()`
	`152`	`+`
	`153`	`+iferr:=trace.Start(traceFile);err!=nil {`
	`154`	`+panic(fmt.Sprintf("failed to start trace: %v",err))`
	`155`	`+}`
	`156`	`+defertrace.Stop()`
	`157`	`+}`
	`158`	`+`
`142`	`159`	`rand.Seed(time.Now().UnixMicro())`
`143`	`160`
`144`	`161`	`cmd,err:=r.Command(subcommands)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (c *wsNetConn) Write(b []byte) (n int, err error) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func (c*wsNetConn)Close()error {`
`35`		`-deferc.cancel()`
	`35`	`+c.cancel()`
`36`	`36`	`returnc.Conn.Close()`
`37`	`37`	`}`
`38`	`38`

Comments

(0)