Return close error in streamrpc.Call

Changelog: other

2 files changed, 6 insertions, 5 deletions

diff --git a/internal/streamrpc/client.go b/internal/streamrpc/client.go
index b26d43f33..e9f3e4ff1 100644
--- a/internal/streamrpc/client.go
+++ b/internal/streamrpc/client.go
@@ -44,7 +44,11 @@ func doCall(dial DialFunc, request []byte, callback func(net.Conn) error) error
 		return &RequestRejectedError{resp.Error}
 	}
 
-	return callback(c)
+	if err := callback(c); err != nil {
+		return err
+	}
+
+	return c.Close()
 }
 
 // RequestRejectedError is returned by Call if the server explicitly
diff --git a/internal/streamrpc/rpc_test.go b/internal/streamrpc/rpc_test.go
index 669222780..850838465 100644
--- a/internal/streamrpc/rpc_test.go
+++ b/internal/streamrpc/rpc_test.go
@@ -73,11 +73,8 @@ func TestCall(t *testing.T) {
 			if _, err := io.Copy(c, bytes.NewReader(in)); err != nil {
 				return err
 			}
-			if err := <-errC; err != nil {
-				return err
-			}
 
-			return c.Close()
+			return <-errC
 		},
 	))