go.mod,private/piecestore: bump storj.io/common

jewharton · jewharton · commit 787d21613e5b · 2026-05-18T09:26:51.000-05:00
This change bumps the version of the storj.io/common dependency.
Additionally, it adjusts usages of sync2.WithTimeout to accommodate
changes in the function that were introduced by the version bump.

Change-Id: I7c365cfea93968ea8b84ea30c0821ef8987bbf36
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/zeebo/errs v1.4.0
 	github.com/zeebo/mwc v0.0.7
 	github.com/zeebo/sudo v1.0.2
-	storj.io/common v0.0.0-20260424095045-b08642b6e25d
+	storj.io/common v0.0.0-20260514184426-9f076a4a8d52
 	storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55
 	storj.io/eventkit v0.0.0-20250410172343-61f26d3de156
 	storj.io/infectious v0.0.2
diff --git a/go.sum b/go.sum
@@ -95,8 +95,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-storj.io/common v0.0.0-20260424095045-b08642b6e25d h1:1Ebi0t6f++zE2NFWi6UpTMwYyntuGaGX4rxnNR9Q5R8=
-storj.io/common v0.0.0-20260424095045-b08642b6e25d/go.mod h1:1GZnCZNGbzBzaqhG0cUypQeLfNhNIeNY9JVMMiCF14M=
+storj.io/common v0.0.0-20260514184426-9f076a4a8d52 h1:yOZ3NAOAzM1ECIdt8sCUdS7YKN8G/yCmgtGwAAw+SZE=
+storj.io/common v0.0.0-20260514184426-9f076a4a8d52/go.mod h1:1GZnCZNGbzBzaqhG0cUypQeLfNhNIeNY9JVMMiCF14M=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55 h1:8OE12DvUnB9lfZcHe7IDGsuhjrY9GBAr964PVHmhsro=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55/go.mod h1:Y9LZaa8esL1PW2IDMqJE7CFSNq7d5bQ3RI7mGPtmKMg=
 storj.io/eventkit v0.0.0-20250410172343-61f26d3de156 h1:5MZ0CyMbG6Pi0rRzUWVG6dvpXjbBYEX2oyXuj+tT+sk=
diff --git a/private/piecestore/download.go b/private/piecestore/download.go
@@ -71,7 +71,10 @@ func (client *Client) Download(ctx context.Context, limit *pb.OrderLimit, pieceP
 
 	ctx, cancel := context2.WithCustomCancel(ctx)
 
-	var underlyingStream downloadStream
+	var (
+		underlyingStream downloadStream
+		timedOut         bool
+	)
 	sync2.WithTimeout(client.config.MessageTimeout, func() {
 		if client.replaySafe != nil {
 			underlyingStream, err = client.replaySafe.Download(ctx)
@@ -80,11 +83,16 @@ func (client *Client) Download(ctx context.Context, limit *pb.OrderLimit, pieceP
 		}
 	}, func() {
 		cancel(errMessageTimeout)
+		timedOut = true
 	})
 	if err != nil {
 		cancel(context.Canceled)
 		return nil, err
 	}
+	if timedOut {
+		return nil, errMessageTimeout
+	}
+
 	stream := &timedDownloadStream{
 		timeout: client.config.MessageTimeout,
 		stream:  underlyingStream,
@@ -386,25 +394,46 @@ func (stream *timedDownloadStream) cancelTimeout() {
 	stream.cancel(errMessageTimeout)
 }
 
-func (stream *timedDownloadStream) Close() (err error) {
-	sync2.WithTimeout(stream.timeout, func() {
-		err = stream.stream.Close()
-	}, stream.cancelTimeout)
-	return CloseError.Wrap(err)
+func (stream *timedDownloadStream) Close() error {
+	return stream.withTimeout(stream.stream.Close)
 }
 
-func (stream *timedDownloadStream) Send(req *pb.PieceDownloadRequest) (err error) {
-	sync2.WithTimeout(stream.timeout, func() {
-		err = stream.stream.Send(req)
-	}, stream.cancelTimeout)
-	return err
+func (stream *timedDownloadStream) Send(req *pb.PieceDownloadRequest) error {
+	return stream.withTimeout(func() error {
+		return stream.stream.Send(req)
+	})
 }
 
 func (stream *timedDownloadStream) Recv() (resp *pb.PieceDownloadResponse, err error) {
+	err = stream.withTimeout(func() error {
+		var recvErr error
+		resp, recvErr = stream.stream.Recv()
+		return recvErr
+	})
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
+func (stream *timedDownloadStream) withTimeout(fn func() error) error {
+	var (
+		err      error
+		timedOut bool
+	)
 	sync2.WithTimeout(stream.timeout, func() {
-		resp, err = stream.stream.Recv()
-	}, stream.cancelTimeout)
-	return resp, err
+		err = fn()
+	}, func() {
+		stream.cancelTimeout()
+		timedOut = true
+	})
+	if err != nil {
+		return CloseError.Wrap(err)
+	}
+	if timedOut {
+		return CloseError.Wrap(errMessageTimeout)
+	}
+	return nil
 }
 
 // syncError synchronizes access to an error and keeps
diff --git a/private/piecestore/upload.go b/private/piecestore/upload.go
@@ -346,22 +346,43 @@ func (stream *timedUploadStream) cancelTimeout() {
 }
 
 func (stream *timedUploadStream) Close() (err error) {
-	sync2.WithTimeout(stream.timeout, func() {
-		err = stream.stream.Close()
-	}, stream.cancelTimeout)
-	return CloseError.Wrap(err)
+	return stream.withTimeout(stream.stream.Close)
 }
 
 func (stream *timedUploadStream) Send(req *pb.PieceUploadRequest) (err error) {
-	sync2.WithTimeout(stream.timeout, func() {
-		err = stream.stream.Send(req)
-	}, stream.cancelTimeout)
-	return err
+	return stream.withTimeout(func() error {
+		return stream.stream.Send(req)
+	})
 }
 
 func (stream *timedUploadStream) CloseAndRecv() (resp *pb.PieceUploadResponse, err error) {
+	err = stream.withTimeout(func() error {
+		var recvErr error
+		resp, recvErr = stream.stream.CloseAndRecv()
+		return recvErr
+	})
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
+func (stream *timedUploadStream) withTimeout(fn func() error) error {
+	var (
+		err      error
+		timedOut bool
+	)
 	sync2.WithTimeout(stream.timeout, func() {
-		resp, err = stream.stream.CloseAndRecv()
-	}, stream.cancelTimeout)
-	return resp, err
+		err = fn()
+	}, func() {
+		stream.cancelTimeout()
+		timedOut = true
+	})
+	if err != nil {
+		return CloseError.Wrap(err)
+	}
+	if timedOut {
+		return CloseError.Wrap(errMessageTimeout)
+	}
+	return nil
 }
diff --git a/testsuite/go.mod b/testsuite/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/zeebo/errs v1.4.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.19.0
-	storj.io/common v0.0.0-20260424095045-b08642b6e25d
+	storj.io/common v0.0.0-20260514184426-9f076a4a8d52
 	storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55
 	storj.io/infectious v0.0.2
 	storj.io/storj v1.152.0-rc.0.20260421124610-e8de53163a03
diff --git a/testsuite/go.sum b/testsuite/go.sum
@@ -731,8 +731,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-storj.io/common v0.0.0-20260424095045-b08642b6e25d h1:1Ebi0t6f++zE2NFWi6UpTMwYyntuGaGX4rxnNR9Q5R8=
-storj.io/common v0.0.0-20260424095045-b08642b6e25d/go.mod h1:1GZnCZNGbzBzaqhG0cUypQeLfNhNIeNY9JVMMiCF14M=
+storj.io/common v0.0.0-20260514184426-9f076a4a8d52 h1:yOZ3NAOAzM1ECIdt8sCUdS7YKN8G/yCmgtGwAAw+SZE=
+storj.io/common v0.0.0-20260514184426-9f076a4a8d52/go.mod h1:1GZnCZNGbzBzaqhG0cUypQeLfNhNIeNY9JVMMiCF14M=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55 h1:8OE12DvUnB9lfZcHe7IDGsuhjrY9GBAr964PVHmhsro=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55/go.mod h1:Y9LZaa8esL1PW2IDMqJE7CFSNq7d5bQ3RI7mGPtmKMg=
 storj.io/eventkit v0.0.0-20250410172343-61f26d3de156 h1:5MZ0CyMbG6Pi0rRzUWVG6dvpXjbBYEX2oyXuj+tT+sk=
