maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't exit background append if backend specific files show up (#7519)

Browse source
This commit is contained in:
Krishnan Parthasarathi 2019-04-13 04:21:32 +05:30 committed by kannappanr
parent f409f10d18
commit 35ef5eb236
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/fs-v1-multipart.go
View file

@ -98,9 +98,8 @@ func (fs *FSObjects) backgroundAppend(ctx context.Context, bucket, object, uploa
} }
partNumber, etag, actualSize, err := fs.decodePartFile(entry) partNumber, etag, actualSize, err := fs.decodePartFile(entry)
if err != nil { if err != nil {
logger.GetReqInfo(ctx).AppendTags("entry", entry) // Skip part files whose name don't match expected format. These could be backend filesystem specific files.
logger.LogIf(ctx, err) continue
return
} }
if partNumber < nextPartNumber { if partNumber < nextPartNumber {
// Part already appended. // Part already appended.
@ -389,8 +388,8 @@ func (fs *FSObjects) ListObjectParts(ctx context.Context, bucket, object, upload
} }
partNumber, etag1, _, derr := fs.decodePartFile(entry) partNumber, etag1, _, derr := fs.decodePartFile(entry)
if derr != nil { if derr != nil {
logger.LogIf(ctx, derr) // Skip part files whose name don't match expected format. These could be backend filesystem specific files.
return result, toObjectErr(derr) continue
} }
etag2, ok := partsMap[partNumber] etag2, ok := partsMap[partNumber]
if !ok { if !ok {

1
go.mod
View file

@ -67,6 +67,7 @@ require (
github.com/nats-io/go-nats-streaming v0.4.2 github.com/nats-io/go-nats-streaming v0.4.2
github.com/nats-io/nats v1.7.2 github.com/nats-io/nats v1.7.2
github.com/nats-io/nkeys v0.0.2 // indirect github.com/nats-io/nkeys v0.0.2 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nsqio/go-nsq v1.0.7 github.com/nsqio/go-nsq v1.0.7
github.com/pascaldekloe/goe v0.1.0 // indirect github.com/pascaldekloe/goe v0.1.0 // indirect
github.com/pkg/errors v0.8.1 // indirect github.com/pkg/errors v0.8.1 // indirect

2
go.sum
View file

@ -425,6 +425,8 @@ github.com/nats-io/nkeys v0.0.2 h1:+qM7QpgXnvDDixitZtQUBDY9w/s9mu1ghS+JIbsrx6M=
github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
github.com/nats-io/nuid v1.0.0 h1:44QGdhbiANq8ZCbUkdn6W5bqtg+mHuDE4wOUuxxndFs= github.com/nats-io/nuid v1.0.0 h1:44QGdhbiANq8ZCbUkdn6W5bqtg+mHuDE4wOUuxxndFs=
github.com/nats-io/nuid v1.0.0/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nats-io/nuid v1.0.0/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/nsqio/go-nsq v0.0.0-20181028195256-0527e80f3ba5/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= github.com/nsqio/go-nsq v0.0.0-20181028195256-0527e80f3ba5/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito=
github.com/nsqio/go-nsq v1.0.7 h1:O0pIZJYTf+x7cZBA0UMY8WxFG79lYTURmWzAAh48ljY= github.com/nsqio/go-nsq v1.0.7 h1:O0pIZJYTf+x7cZBA0UMY8WxFG79lYTURmWzAAh48ljY=
github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito=