From de8cedd591cedafec69503d93df53f53b1128fff Mon Sep 17 00:00:00 2001 From: Prince Kumar Date: Tue, 10 Jan 2023 19:05:45 +0530 Subject: [PATCH] Refreshing the gCloud go module in gcsfuse --- go.mod | 2 +- go.sum | 2 ++ vendor/github.com/jacobsa/gcloud/gcs/retry.go | 9 ++++++++- vendor/modules.txt | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 44e09c2f4f..1690d65685 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f github.com/jacobsa/fuse v0.0.0-20221016084658-a4cd154343d8 - github.com/jacobsa/gcloud v0.0.0-20220926120811-1a153c059feb + github.com/jacobsa/gcloud v0.0.0-20230110125859-49bc5a12f398 github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 diff --git a/go.sum b/go.sum index 28f038b923..b70950a997 100644 --- a/go.sum +++ b/go.sum @@ -240,6 +240,8 @@ github.com/jacobsa/gcloud v0.0.0-20220902140020-1c120ff05604 h1:CS7nR1glaHgdAdx+ github.com/jacobsa/gcloud v0.0.0-20220902140020-1c120ff05604/go.mod h1:kYk8Udk1FpP2Nn/ABkB6yT7jHkDhewIq8eGRZMLRGDU= github.com/jacobsa/gcloud v0.0.0-20220926120811-1a153c059feb h1:CcpAA2yBBTGYThuwoT+/s/gbLeq2IAvy+o31+o/zIhY= github.com/jacobsa/gcloud v0.0.0-20220926120811-1a153c059feb/go.mod h1:kYk8Udk1FpP2Nn/ABkB6yT7jHkDhewIq8eGRZMLRGDU= +github.com/jacobsa/gcloud v0.0.0-20230110125859-49bc5a12f398 h1:Y2qdiZE33dd5Jv61NVSka0jGp3FJU/E8+ZsCavdPMjs= +github.com/jacobsa/gcloud v0.0.0-20230110125859-49bc5a12f398/go.mod h1:kYk8Udk1FpP2Nn/ABkB6yT7jHkDhewIq8eGRZMLRGDU= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= diff --git a/vendor/github.com/jacobsa/gcloud/gcs/retry.go b/vendor/github.com/jacobsa/gcloud/gcs/retry.go index f3310c176b..fdecbfde89 100644 --- a/vendor/github.com/jacobsa/gcloud/gcs/retry.go +++ b/vendor/github.com/jacobsa/gcloud/gcs/retry.go @@ -430,6 +430,13 @@ func (rb *retryBucket) CreateObject( seeker = bytes.NewReader(data) } + // Storing the current seek state so that we can use it to reset before making + // further retry call. + currSeekPos, err := seeker.Seek(0, io.SeekCurrent) + if err != nil { + return nil, err + } + reqCopy := *req // Call through with that request. @@ -438,7 +445,7 @@ func (rb *retryBucket) CreateObject( fmt.Sprintf("CreateObject(%q)", req.Name), rb.maxSleep, func() (err error) { - if _, err = seeker.Seek(0, io.SeekStart); err != nil { + if _, err = seeker.Seek(currSeekPos, io.SeekStart); err != nil { return } reqCopy.Contents = seeker diff --git a/vendor/modules.txt b/vendor/modules.txt index 2182370008..8663346530 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -165,7 +165,7 @@ github.com/jacobsa/fuse/fuseutil github.com/jacobsa/fuse/internal/buffer github.com/jacobsa/fuse/internal/freelist github.com/jacobsa/fuse/internal/fusekernel -# github.com/jacobsa/gcloud v0.0.0-20220926120811-1a153c059feb +# github.com/jacobsa/gcloud v0.0.0-20230110125859-49bc5a12f398 ## explicit; go 1.18 github.com/jacobsa/gcloud/gcs github.com/jacobsa/gcloud/gcs/gcscaching