From f8c5c241597fd5d10925385fb066a8e0ebc2bb99 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Tue, 12 Oct 2021 09:24:00 -0700
Subject: [PATCH] force delete should just use rename() (#13417)

use rename() instead of forced blocking
delete call, faster for large namespaces.
---
 cmd/xl-storage.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go
index 5e9131791..d486c0a74 100644
--- a/cmd/xl-storage.go
+++ b/cmd/xl-storage.go
@@ -743,13 +743,15 @@ func (s *xlStorage) DeleteVol(ctx context.Context, volume string, forceDelete bo
 	}
 
 	if forceDelete {
-		err = renameAll(volumeDir, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID()))
+		err = s.moveToTrash(volumeDir, true)
 	} else {
 		err = Remove(volumeDir)
 	}
 
 	if err != nil {
 		switch {
+		case errors.Is(err, errFileNotFound):
+			return errVolumeNotFound
 		case osIsNotExist(err):
 			return errVolumeNotFound
 		case isSysErrNotEmpty(err):
@@ -814,6 +816,14 @@ func (s *xlStorage) DeleteVersions(ctx context.Context, volume string, versions
 	return errs
 }
 
+func (s *xlStorage) moveToTrash(filePath string, recursive bool) error {
+	pathUUID := mustGetUUID()
+	if recursive {
+		return renameAll(filePath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, pathUUID))
+	}
+	return Rename(filePath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, pathUUID))
+}
+
 // DeleteVersion - deletes FileInfo metadata for path at `xl.meta`. forceDelMarker
 // will force creating a new `xl.meta` to create a new delete marker
 func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi FileInfo, forceDelMarker bool) error {
@@ -879,7 +889,7 @@ func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi F
 			if err = checkPathLength(filePath); err != nil {
 				return err
 			}
-			if err = renameAll(filePath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID())); err != nil {
+			if err = s.moveToTrash(filePath, true); err != nil {
 				if err != errFileNotFound {
 					return err
 				}
@@ -902,7 +912,7 @@ func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi F
 		return err
 	}
 
-	err = Rename(filePath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID()))
+	err = s.moveToTrash(filePath, false)
 	if err == nil || err == errFileNotFound {
 		s.deleteFile(volumeDir, pathJoin(volumeDir, path), false)
 	}
@@ -1722,7 +1732,7 @@ func (s *xlStorage) deleteFile(basePath, deletePath string, recursive bool) erro
 
 	var err error
 	if recursive {
-		err = renameAll(deletePath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID()))
+		err = s.moveToTrash(deletePath, true)
 	} else {
 		err = Remove(deletePath)
 	}
@@ -1740,6 +1750,8 @@ func (s *xlStorage) deleteFile(basePath, deletePath string, recursive bool) erro
 			return nil
 		case osIsNotExist(err):
 			return nil
+		case errors.Is(err, errFileNotFound):
+			return nil
 		case osIsPermission(err):
 			return errFileAccessDenied
 		case isSysErrIO(err):
@@ -2017,7 +2029,7 @@ func (s *xlStorage) RenameData(ctx context.Context, srcVolume, srcPath string, f
 
 		// renameAll only for objects that have xl.meta not saved inline.
 		if len(fi.Data) == 0 && fi.Size > 0 {
-			renameAll(dstDataPath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID()))
+			s.moveToTrash(dstDataPath, true)
 			if err = renameAll(srcDataPath, dstDataPath); err != nil {
 				if legacyPreserved {
 					// Any failed rename calls un-roll previous transaction.
@@ -2046,7 +2058,7 @@ func (s *xlStorage) RenameData(ctx context.Context, srcVolume, srcPath string, f
 		// movement, this is to ensure that previous data references can co-exist for
 		// any recoverability.
 		if oldDstDataPath != "" {
-			renameAll(oldDstDataPath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID()))
+			s.moveToTrash(oldDstDataPath, true)
 		}
 	} else {
 		// Write meta-file directly, no data