Commit4142fb3

committed

chore: shutdown provisioner should stop waiting on client

1 parent845407f commit4142fb3Copy full SHA for 4142fb3

File tree

-0

lines changed

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,12 @@ func (r RootCmd) provisionerDaemonStart() serpent.Command {`
`239`	`239`	`returnxerrors.Errorf("shutdown: %w",err)`
`240`	`240`	`}`
`241`	`241`
	`242`	`+// Shutdown does not call close. Must call it manually.`
	`243`	`+err=srv.Close()`
	`244`	`+iferr!=nil {`
	`245`	`+returnxerrors.Errorf("close server: %w",err)`
	`246`	`+}`
	`247`	`+`
`242`	`248`	`cancel()`
`243`	`249`	`ifxerrors.Is(exitErr,context.Canceled) {`
`244`	`250`	`returnnil`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,9 @@ func (p *Server) client() (proto.DRPCProvisionerDaemonClient, bool) {`
`236`	`236`	`select {`
`237`	`237`	`case<-p.closeContext.Done():`
`238`	`238`	`returnnil,false`
	`239`	`+case<-p.shuttingDownCh:`
	`240`	`+// Shutting down should return a nil client and unblock`
	`241`	`+returnnil,false`
`239`	`242`	`caseclient:=<-p.clientCh:`
`240`	`243`	`returnclient,true`
`241`	`244`	`}`

Comments

(0)