From 30c9e50701b5472a076235a5150fca61570ffb3f Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Wed, 18 May 2022 17:58:19 -0700
Subject: [PATCH] make sure to ignore expected errors and dirname deletes
 (#14945)

---
 cmd/admin-handlers-users_test.go | 4 ++++
 cmd/erasure-server-pool-decom.go | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cmd/admin-handlers-users_test.go b/cmd/admin-handlers-users_test.go
index 9a9ec0391..91ebdffa2 100644
--- a/cmd/admin-handlers-users_test.go
+++ b/cmd/admin-handlers-users_test.go
@@ -28,6 +28,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -189,6 +190,9 @@ func (s *TestSuiteIAM) getUserClient(c *check, accessKey, secretKey, sessionToke
 }
 
 func TestIAMInternalIDPServerSuite(t *testing.T) {
+	if runtime.GOOS == globalWindowsOSName {
+		t.Skip("windows is clunky disable these tests")
+	}
 	for i, testCase := range iamTestSuites {
 		t.Run(
 			fmt.Sprintf("Test: %d, ServerType: %s", i+1, testCase.ServerTypeDescription),
diff --git a/cmd/erasure-server-pool-decom.go b/cmd/erasure-server-pool-decom.go
index 0ddd79eb6..d9e1d2a3b 100644
--- a/cmd/erasure-server-pool-decom.go
+++ b/cmd/erasure-server-pool-decom.go
@@ -699,6 +699,10 @@ func (z *erasureServerPools) decommissionPool(ctx context.Context, idx int, pool
 						ObjectOptions{
 							VersionID: version.VersionID,
 						})
+					if isErrObjectNotFound(err) {
+						// object deleted by the application, nothing to do here we move on.
+						return
+					}
 					if err != nil {
 						failure = true
 						logger.LogIf(ctx, err)
@@ -725,7 +729,7 @@ func (z *erasureServerPools) decommissionPool(ctx context.Context, idx int, pool
 			if decommissionedCount == len(fivs.Versions) {
 				_, err := set.DeleteObject(ctx,
 					bName,
-					entry.name,
+					encodeDirObject(entry.name),
 					ObjectOptions{
 						DeletePrefix: true, // use prefix delete to delete all versions at once.
 					},