Commit860e282

authored

fix: Prevent race between provisionerd connect and close (#6206)

* fix: Prevent race between provisionerd connect and close* test: Add detection for provisioner creation after test completion

1 parentcde7ff8 commit860e282Copy full SHA for 860e282

File tree

+126

-31

lines changed

+126

-31

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,17 @@ func (p *Server) connect(ctx context.Context) {`
`177`	`177`	`p.opts.Logger.Warn(context.Background(),"failed to dial",slog.Error(err))`
`178`	`178`	`continue`
`179`	`179`	`}`
	`180`	`+// Ensure connection is not left hanging during a race between`
	`181`	`+// close and dial succeeding.`
	`182`	`+p.mutex.Lock()`
	`183`	`+ifp.isClosed() {`
	`184`	`+client.DRPCConn().Close()`
	`185`	`+p.mutex.Unlock()`
	`186`	`+break`
	`187`	`+}`
`180`	`188`	`p.clientValue.Store(client)`
	`189`	`+p.mutex.Unlock()`
	`190`	`+`
`181`	`191`	`p.opts.Logger.Debug(context.Background(),"connected")`
`182`	`192`	`break`
`183`	`193`	`}`
`@@ -390,7 +400,8 @@ func retryable(err error) bool {`
`390`	`400`	`// is not retryable() or the context expires.`
`391`	`401`	`func (p*Server)clientDoWithRetries(`
`392`	`402`	`ctx context.Context,ffunc(context.Context, proto.DRPCProvisionerDaemonClient) (any,error)) (`
`393`		`-any,error) {`
	`403`	`+any,error,`
	`404`	`+) {`
`394`	`405`	`forretrier:=retry.New(25time.Millisecond,5time.Second);retrier.Wait(ctx); {`
`395`	`406`	`client,ok:=p.client()`
`396`	`407`	`if!ok {`

Comments

(0)