mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
fix: Improve closure of provisioner and agent tailnet dial (#6199)
This commit is contained in:
committed by
GitHub
parent
5df7872661
commit
41ae01d2e9
@@ -520,5 +520,9 @@ func (p *Server) closeWithError(err error) error {
|
||||
|
||||
p.opts.Logger.Debug(context.Background(), "closing server with error", slog.Error(err))
|
||||
|
||||
if c, ok := p.clientValue.Load().(proto.DRPCProvisionerDaemonClient); ok {
|
||||
_ = c.DRPCConn().Close()
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -1097,7 +1097,6 @@ func createProvisionerDaemonClient(t *testing.T, server provisionerDaemonTestSer
|
||||
}()
|
||||
t.Cleanup(func() {
|
||||
cancelFunc()
|
||||
_ = serverPipe.Close()
|
||||
<-closed
|
||||
})
|
||||
return proto.NewDRPCProvisionerDaemonClient(clientPipe)
|
||||
@@ -1117,10 +1116,15 @@ func createProvisionerClient(t *testing.T, server provisionerTestServer) sdkprot
|
||||
require.NoError(t, err)
|
||||
srv := drpcserver.New(mux)
|
||||
ctx, cancelFunc := context.WithCancel(context.Background())
|
||||
t.Cleanup(cancelFunc)
|
||||
closed := make(chan struct{})
|
||||
go func() {
|
||||
defer close(closed)
|
||||
_ = srv.Serve(ctx, serverPipe)
|
||||
}()
|
||||
t.Cleanup(func() {
|
||||
cancelFunc()
|
||||
<-closed
|
||||
})
|
||||
return sdkproto.NewDRPCProvisionerClient(clientPipe)
|
||||
}
|
||||
|
||||
@@ -1150,6 +1154,7 @@ type provisionerDaemonTestServer struct {
|
||||
func (p *provisionerDaemonTestServer) AcquireJob(ctx context.Context, empty *proto.Empty) (*proto.AcquiredJob, error) {
|
||||
return p.acquireJob(ctx, empty)
|
||||
}
|
||||
|
||||
func (p *provisionerDaemonTestServer) CommitQuota(ctx context.Context, com *proto.CommitQuotaRequest) (*proto.CommitQuotaResponse, error) {
|
||||
if p.commitQuota == nil {
|
||||
return &proto.CommitQuotaResponse{
|
||||
|
||||
Reference in New Issue
Block a user