Commit64f6496

committed

fix: Improve closure of provisioner and agent tailnet dial

1 parente5cb6ac commit64f6496Copy full SHA for 64f6496

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -393,13 +393,16 @@ func NewProvisionerDaemon(t testing.T, coderAPI coderd.API) io.Closer {`
`393`	`393`	`funcNewExternalProvisionerDaemon(ttesting.T,clientcodersdk.Client,org uuid.UUID,tagsmap[string]string) io.Closer {`
`394`	`394`	`echoClient,echoServer:=provisionersdk.MemTransportPipe()`
`395`	`395`	`ctx,cancelFunc:=context.WithCancel(context.Background())`
	`396`	`+serveDone:=make(chanstruct{})`
`396`	`397`	`t.Cleanup(func() {`
`397`	`398`	`_=echoClient.Close()`
`398`	`399`	`_=echoServer.Close()`
`399`	`400`	`cancelFunc()`
	`401`	`+<-serveDone`
`400`	`402`	`})`
`401`	`403`	`fs:=afero.NewMemMapFs()`
`402`	`404`	`gofunc() {`
	`405`	`+deferclose(serveDone)`
`403`	`406`	`err:=echo.Serve(ctx,fs,&provisionersdk.ServeOptions{`
`404`	`407`	`Listener:echoServer,`
`405`	`408`	`})`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -446,6 +446,8 @@ func (api API) dialWorkspaceAgentTailnet(r http.Request, agentID uuid.UUID) (*`
`446`	`446`	`Logger:api.Logger.Named("tailnet"),`
`447`	`447`	`})`
`448`	`448`	`iferr!=nil {`
	`449`	`+_=clientConn.Close()`
	`450`	`+_=serverConn.Close()`
`449`	`451`	`returnnil,xerrors.Errorf("create tailnet conn: %w",err)`
`450`	`452`	`}`
`451`	`453`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -520,5 +520,9 @@ func (p *Server) closeWithError(err error) error {`
`520`	`520`
`521`	`521`	`p.opts.Logger.Debug(context.Background(),"closing server with error",slog.Error(err))`
`522`	`522`
	`523`	`+ifc,ok:=p.clientValue.Load().(proto.DRPCProvisionerDaemonClient);ok {`
	`524`	`+_=c.Close()`
	`525`	`+}`
	`526`	`+`
`523`	`527`	`returnerr`
`524`	`528`	`}`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,6 @@ func createProvisionerDaemonClient(t *testing.T, server provisionerDaemonTestSer`
`1097`	`1097`	`}()`
`1098`	`1098`	`t.Cleanup(func() {`
`1099`	`1099`	`cancelFunc()`
`1100`		`-_=serverPipe.Close()`
`1101`	`1100`	`<-closed`
`1102`	`1101`	`})`
`1103`	`1102`	`returnproto.NewDRPCProvisionerDaemonClient(clientPipe)`
`@@ -1117,10 +1116,15 @@ func createProvisionerClient(t *testing.T, server provisionerTestServer) sdkprot`
`1117`	`1116`	`require.NoError(t,err)`
`1118`	`1117`	`srv:=drpcserver.New(mux)`
`1119`	`1118`	`ctx,cancelFunc:=context.WithCancel(context.Background())`
`1120`		`-t.Cleanup(cancelFunc)`
	`1119`	`+closed:=make(chanstruct{})`
`1121`	`1120`	`gofunc() {`
	`1121`	`+deferclose(closed)`
`1122`	`1122`	`_=srv.Serve(ctx,serverPipe)`
`1123`	`1123`	`}()`
	`1124`	`+t.Cleanup(func() {`
	`1125`	`+cancelFunc()`
	`1126`	`+<-closed`
	`1127`	`+})`
`1124`	`1128`	`returnsdkproto.NewDRPCProvisionerClient(clientPipe)`
`1125`	`1129`	`}`
`1126`	`1130`
`@@ -1150,6 +1154,7 @@ type provisionerDaemonTestServer struct {`
`1150`	`1154`	`func (pprovisionerDaemonTestServer)AcquireJob(ctx context.Context,emptyproto.Empty) (*proto.AcquiredJob,error) {`
`1151`	`1155`	`returnp.acquireJob(ctx,empty)`
`1152`	`1156`	`}`
	`1157`	`+`
`1153`	`1158`	`func (pprovisionerDaemonTestServer)CommitQuota(ctx context.Context,comproto.CommitQuotaRequest) (*proto.CommitQuotaResponse,error) {`
`1154`	`1159`	`ifp.commitQuota==nil {`
`1155`	`1160`	`return&proto.CommitQuotaResponse{`

Comments

(0)