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

cleaning up will delete instead of rename to trash with full disk err (#18534)

Browse Source 
moveToTrash() function moves a folder to .trash, for example, when 
doing some object deletions: a data dir that has many parts will be 
renamed to the trash folder; However, ENOSPC is a valid error from 
rename(), and it can cripple a user trying to free some space in an 
entire disk situation.

Therefore, this commit will try to do a recursive delete in that case.
This commit is contained in:
Anis Eleuch 2023-11-27 17:36:02 -08:00 committed by GitHub
parent bd0819330d
commit 9cb94eb4a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/xl-storage.go
View File

@ -1095,20 +1095,29 @@ func (s *xlStorage) DeleteVersions(ctx context.Context, volume string, versions
return errs return errs
} }
func (s *xlStorage) moveToTrash(filePath string, recursive, force bool) error { func (s *xlStorage) moveToTrash(filePath string, recursive, force bool) (err error) {
pathUUID := mustGetUUID() pathUUID := mustGetUUID()
targetPath := pathutil.Join(s.drivePath, minioMetaTmpDeletedBucket, pathUUID) targetPath := pathutil.Join(s.drivePath, minioMetaTmpDeletedBucket, pathUUID)
if recursive { if recursive {
if err := renameAll(filePath, targetPath, pathutil.Join(s.drivePath, minioMetaTmpDeletedBucket)); err != nil { err = renameAll(filePath, targetPath, pathutil.Join(s.drivePath, minioMetaTmpDeletedBucket))
return err
}
} else { } else {
if err := Rename(filePath, targetPath); err != nil { err = Rename(filePath, targetPath)
return err }
// ENOSPC is a valid error from rename(); remove instead of rename in that case
if err == errDiskFull {
if recursive {
err = removeAll(filePath)
} else {
err = Remove(filePath)
} }
} }
if err != nil {
return err
}
// immediately purge the target // immediately purge the target
if force { if force {
removeAll(targetPath) removeAll(targetPath)