diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /workhorse/internal/upload/destination/objectstore/uploader.go | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'workhorse/internal/upload/destination/objectstore/uploader.go')
-rw-r--r-- | workhorse/internal/upload/destination/objectstore/uploader.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/workhorse/internal/upload/destination/objectstore/uploader.go b/workhorse/internal/upload/destination/objectstore/uploader.go index aedfbe55ead..43e573872ee 100644 --- a/workhorse/internal/upload/destination/objectstore/uploader.go +++ b/workhorse/internal/upload/destination/objectstore/uploader.go @@ -80,13 +80,13 @@ func (u *uploader) Consume(outerCtx context.Context, reader io.Reader, deadline cr := &countReader{r: reader} if err := u.strategy.Upload(uploadCtx, cr); err != nil { - return cr.n, err + return 0, err } if u.checkETag { if err := compareMD5(hexString(hasher), u.strategy.ETag()); err != nil { log.ContextLogger(uploadCtx).WithError(err).Error("error comparing MD5 checksum") - return cr.n, err + return 0, err } } |