Merge branch 'readclose' into apps

kylecarbs · kylecarbs · commit b6e6d7b17654 · 2022-05-31T15:53:44.000Z
diff --git a/coderd/wsconncache/wsconncache.go b/coderd/wsconncache/wsconncache.go
@@ -90,12 +90,14 @@ func (c *Cache) Acquire(r *http.Request, id uuid.UUID) (*Conn, func(), error) {
 		go func() {
 			select {
 			case <-timeoutCtx.Done():
-				_ = conn.CloseWithError(xerrors.New("cache timeout"))
 			case <-conn.Closed():
 			}
 			c.connMutex.Lock()
 			delete(c.conns, id)
 			c.connMutex.Unlock()
+			// This should close after the delete so callers
+			// can check the `Closed()` channel for this to be expired.
+			_ = conn.CloseWithError(xerrors.New("cache timeout"))
 		}()
 		c.connMutex.Lock()
 		c.conns[id] = conn
diff --git a/provisionersdk/transport.go b/provisionersdk/transport.go
@@ -3,6 +3,7 @@ package provisionersdk
 import (
 	"context"
 	"io"
+	"sync"
 
 	"github.com/hashicorp/yamux"
 	"storj.io/drpc"
@@ -45,11 +46,14 @@ func Conn(session *yamux.Session) drpc.Conn {
 }
 
 type readWriteCloser struct {
+	closeMutex sync.Mutex
 	io.ReadCloser
 	io.WriteCloser
 }
 
 func (c *readWriteCloser) Close() error {
+	c.closeMutex.Lock()
+	defer c.closeMutex.Unlock()
 	err := c.ReadCloser.Close()
 	if err != nil {
 		return err
