MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 23:43:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove tmp file and multipart folder in FS mode. (#6677)

Browse Source 
Fixes #6588
This commit is contained in:
Aarushi Arya 2018-10-22 07:36:30 -07:00 committed by kannappanr
parent 989d7af9ac
commit 7c2ae4eaf7
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -713,6 +713,11 @@ func (fs *FSObjects) AbortMultipartUpload(ctx context.Context, bucket, object, u
} }
fs.appendFileMapMu.Lock() fs.appendFileMapMu.Lock()
// Remove file in tmp folder
file := fs.appendFileMap[uploadID]
if file != nil {
fsRemoveFile(ctx, file.filePath)
}
delete(fs.appendFileMap, uploadID) delete(fs.appendFileMap, uploadID)
fs.appendFileMapMu.Unlock() fs.appendFileMapMu.Unlock()
@ -725,10 +730,14 @@ func (fs *FSObjects) AbortMultipartUpload(ctx context.Context, bucket, object, u
} }
return toObjectErr(err, bucket, object) return toObjectErr(err, bucket, object)
} }
// Ignore the error returned as Windows fails to remove directory if a file in it // Ignore the error returned as Windows fails to remove directory if a file in it
// is Open()ed by the backgroundAppend() // is Open()ed by the backgroundAppend()
fsRemoveAll(ctx, uploadIDDir) fsRemoveAll(ctx, uploadIDDir)
// It is safe to ignore any directory not empty error (in case there were multiple uploadIDs on the same object)
fsRemoveDir(ctx, fs.getMultipartSHADir(bucket, object))
return nil return nil
} }