Skip to content

Commit

Permalink
Revert "fs-v1-multipart: Only stat remaining object parts"
Browse files Browse the repository at this point in the history
This reverts commit 7aa0a9d.
  • Loading branch information
rluetzner authored and iternity-dotcom committed Jun 2, 2022
1 parent 310e44c commit 6e2786f
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions cmd/fs-v1-multipart.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (fs *FSObjects) backgroundAppend(ctx context.Context, bucket, object, uploa
// Since we append sequentially nextPartNumber will always be len(file.parts)+1
nextPartNumber := len(file.parts) + 1
uploadIDPath := fs.getUploadIDDir(bucket, object, uploadID)
parts, err := fs.getRemainingUploadedChunks(ctx, bucket, object, uploadID, nextPartNumber)
parts, err := fs.getUploadedChunks(ctx, bucket, object, uploadID)
if err != nil {
logger.LogIf(ctx, err)
return
Expand Down Expand Up @@ -120,7 +120,7 @@ func (fs *FSObjects) backgroundAppend(ctx context.Context, bucket, object, uploa
}

// Get uploaded chunks from multipart folder in metabucket
func (fs *FSObjects) getRemainingUploadedChunks(ctx context.Context, bucket, object, uploadID string, nextPartNumber int) ([]ObjectPartInfo, error) {
func (fs *FSObjects) getUploadedChunks(ctx context.Context, bucket, object, uploadID string) ([]ObjectPartInfo, error) {
// Setting count to -1 will read everything.
foundFiles, err := fs.disk.ListDir(ctx, pathJoin(minioMetaMultipartBucket, fs.getMultipartSHADir(bucket, object)), uploadID, -1)
if err != nil {
Expand All @@ -138,11 +138,6 @@ func (fs *FSObjects) getRemainingUploadedChunks(ctx context.Context, bucket, obj
continue
}

if number < nextPartNumber {
// Part already appended.
continue
}

uploadIDPath := fs.getUploadIDDir(bucket, object, uploadID)
fi, err := fs.disk.StatObject(ctx, pathJoin(minioMetaMultipartBucket, uploadIDPath, file))
if err != nil {
Expand Down Expand Up @@ -540,7 +535,7 @@ func (fs *FSObjects) ListObjectParts(ctx context.Context, bucket, object, upload
result.PartNumberMarker = partNumberMarker
result.UserDefined = cloneMSS(fi.Metadata)

parts, err := fs.getRemainingUploadedChunks(ctx, bucket, object, uploadID, -1)
parts, err := fs.getUploadedChunks(ctx, bucket, object, uploadID)
if err != nil {
return ListPartsInfo{}, toObjectErr(err, bucket, object)
}
Expand Down Expand Up @@ -640,7 +635,7 @@ func (fs *FSObjects) CompleteMultipartUpload(ctx context.Context, bucket string,
// Allocate parts similar to incoming slice.
fi.Parts = make([]ObjectPartInfo, len(parts))

chunks, err := fs.getRemainingUploadedChunks(ctx, bucket, object, uploadID, -1)
chunks, err := fs.getUploadedChunks(ctx, bucket, object, uploadID)
if err != nil {
return ObjectInfo{}, err
}
Expand Down

0 comments on commit 6e2786f

Please sign in to comment.