MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove frivolous log about abort-multipart failure in replication (#19413)

Browse Source
This commit is contained in:
Harshavardhana 2024-04-05 04:39:55 -07:00 committed by GitHub
parent a86d98826d
commit 96d226c0b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildscripts/minio-upgrade.sh
View File

@ -55,6 +55,11 @@ __init__() {
go install github.com/minio/mc@latest go install github.com/minio/mc@latest
## this is needed because github actions don't have
## docker-compose on all runners
go install github.com/docker/compose/v2/cmd@latest
mv -v /tmp/gopath/bin/cmd /tmp/gopath/bin/docker-compose
TAG=minio/minio:dev make docker TAG=minio/minio:dev make docker
MINIO_VERSION=RELEASE.2019-12-19T22-52-26Z docker-compose \ MINIO_VERSION=RELEASE.2019-12-19T22-52-26Z docker-compose \

8
cmd/bucket-replication.go
View File

@ -1593,14 +1593,10 @@ func replicateObjectWithMultipart(ctx context.Context, c *minio.Core, bucket, ob
for attempts <= 3 { for attempts <= 3 {
actx, acancel := context.WithTimeout(ctx, time.Minute) actx, acancel := context.WithTimeout(ctx, time.Minute)
aerr := c.AbortMultipartUpload(actx, bucket, object, uploadID) aerr := c.AbortMultipartUpload(actx, bucket, object, uploadID)
acancel()
if aerr == nil { if aerr == nil {
acancel()
return return
} }
acancel()
replLogIf(actx,
fmt.Errorf("trying %s: Unable to cleanup failed multipart replication %s on remote %s/%s: %w - this may consume space on remote cluster",
humanize.Ordinal(attempts), uploadID, bucket, object, aerr))
attempts++ attempts++
time.Sleep(time.Duration(rand.Int63n(int64(time.Second)))) time.Sleep(time.Duration(rand.Int63n(int64(time.Second))))
} }
@ -1648,6 +1644,8 @@ func replicateObjectWithMultipart(ctx context.Context, c *minio.Core, bucket, ob
ETag: pInfo.ETag, ETag: pInfo.ETag,
}) })
} }
// really big value but its okay on heavily loaded systems. This is just tail end timeout.
cctx, ccancel := context.WithTimeout(ctx, 10*time.Minute) cctx, ccancel := context.WithTimeout(ctx, 10*time.Minute)
defer ccancel() defer ccancel()
_, err = c.CompleteMultipartUpload(cctx, bucket, object, uploadID, uploadedParts, minio.PutObjectOptions{ _, err = c.CompleteMultipartUpload(cctx, bucket, object, uploadID, uploadedParts, minio.PutObjectOptions{