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

xl: Do not use isDirEmpty() when removing empty parent dir (#11851)

Browse source 
It is enough to rely directly on os.Remove() golang API to remove empty
directory since the API is only supposed to remove empty directories and
files.
This commit is contained in:
Anis Elleuch 2021-03-22 17:10:26 +01:00 committed by GitHub
parent 987c625255
commit 768251b08b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cmd/xl-storage.go
View file

@ -2288,16 +2288,8 @@ func (s *xlStorage) RenameData(ctx context.Context, srcVolume, srcPath, dataDir,
}
// Remove parent dir of the source file if empty
if parentDir := slashpath.Dir(srcFilePath); isDirEmpty(parentDir) {
deleteFile(srcVolumeDir, parentDir, false)
}
if srcDataPath != "" {
if parentDir := slashpath.Dir(srcDataPath); isDirEmpty(parentDir) {
deleteFile(srcVolumeDir, parentDir, false)
}
}
parentDir := slashpath.Dir(srcFilePath)
deleteFile(srcVolumeDir, parentDir, false)
return nil
}
@ -2354,18 +2346,18 @@ func (s *xlStorage) RenameFile(ctx context.Context, srcVolume, srcPath, dstVolum
// If source is a directory, we expect the destination to be non-existent but we
// we still need to allow overwriting an empty directory since it represents
// an object empty directory.
_, err = os.Stat(dstFilePath)
if isSysErrIO(err) {
return errFaultyDisk
}
if err == nil && !isDirEmpty(dstFilePath) {
return errFileAccessDenied
}
if err != nil && !os.IsNotExist(err) {
return err
}
// Empty destination remove it before rename.
if isDirEmpty(dstFilePath) {
dirInfo, err := os.Stat(dstFilePath)
if err != nil {
if isSysErrIO(err) {
return errFaultyDisk
}
if !os.IsNotExist(err) {
return err
}
} else {
if !dirInfo.IsDir() {
return errFileAccessDenied
}
if err = os.Remove(dstFilePath); err != nil {
if isSysErrNotEmpty(err) {
return errFileAccessDenied
@ -2380,10 +2372,8 @@ func (s *xlStorage) RenameFile(ctx context.Context, srcVolume, srcPath, dstVolum
}
// Remove parent dir of the source file if empty
if parentDir := slashpath.Dir(srcFilePath); isDirEmpty(parentDir) {
deleteFile(srcVolumeDir, parentDir, false)
}
parentDir := slashpath.Dir(srcFilePath)
deleteFile(srcVolumeDir, parentDir, false)
return nil
}