Commitcec2de3

committed

fix: Race when writing to a closed pipe

This is such an intermittent race it's difficult to track,but regardless this is an improvement to the code.

1 parent9b19dc9 commitcec2de3Copy full SHA for cec2de3

File tree

+19

-8

lines changed

+19

-8

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser`
`31`	`31`	`ifoptions.Listener==nil {`
`32`	`32`	`config:=yamux.DefaultConfig()`
`33`	`33`	`config.LogOutput=io.Discard`
`34`		`-stdio,err:=yamux.Server(readWriteCloser{`
`35`		`-ReadCloser:os.Stdin,`
`36`		`-Writer:os.Stdout,`
	`34`	`+stdio,err:=yamux.Server(&readWriteCloser{`
	`35`	`+ReadCloser:os.Stdin,`
	`36`	`+WriteCloser:os.Stdout,`
`37`	`37`	`},config)`
`38`	`38`	`iferr!=nil {`
`39`	`39`	`returnxerrors.Errorf("create yamux: %w",err)`
`@@ -54,6 +54,9 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser`
`54`	`54`	`// short-lived processes that can be executed concurrently.`
`55`	`55`	`err=srv.Serve(ctx,options.Listener)`
`56`	`56`	`iferr!=nil {`
	`57`	`+iferrors.Is(err,io.EOF) {`
	`58`	`+returnnil`
	`59`	`+}`
`57`	`60`	`iferrors.Is(err,context.Canceled) {`
`58`	`61`	`returnnil`
`59`	`62`	`}`

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,16 @@ func TransportPipe() (yamux.Session, yamux.Session) {`
`22`	`22`	`yamuxConfig:=yamux.DefaultConfig()`
`23`	`23`	`yamuxConfig.LogOutput=io.Discard`
`24`	`24`	`client,err:=yamux.Client(&readWriteCloser{`
`25`		`-ReadCloser:clientReader,`
`26`		`-Writer:serverWriter,`
	`25`	`+ReadCloser:clientReader,`
	`26`	`+WriteCloser:serverWriter,`
`27`	`27`	`},yamuxConfig)`
`28`	`28`	`iferr!=nil {`
`29`	`29`	`panic(err)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`server,err:=yamux.Server(&readWriteCloser{`
`33`		`-ReadCloser:serverReader,`
`34`		`-Writer:clientWriter,`
	`33`	`+ReadCloser:serverReader,`
	`34`	`+WriteCloser:clientWriter,`
`35`	`35`	`},yamuxConfig)`
`36`	`36`	`iferr!=nil {`
`37`	`37`	`panic(err)`
`@@ -46,7 +46,15 @@ func Conn(session *yamux.Session) drpc.Conn {`
`46`	`46`
`47`	`47`	`typereadWriteCloserstruct {`
`48`	`48`	`io.ReadCloser`
`49`		`-io.Writer`
	`49`	`+io.WriteCloser`
	`50`	`+}`
	`51`	`+`
	`52`	`+func (c*readWriteCloser)Close()error {`
	`53`	`+err:=c.ReadCloser.Close()`
	`54`	`+iferr!=nil {`
	`55`	`+returnerr`
	`56`	`+}`
	`57`	`+returnc.WriteCloser.Close()`
`50`	`58`	`}`
`51`	`59`
`52`	`60`	`// Allows concurrent requests on a single dRPC connection.`

Comments

(0)