From d28f5a3978f80c52b1434bdf6f5c5db997aa8936 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Mon, 8 Jun 2026 17:07:21 -0700
Subject: [PATCH] fix(ec): surface metadata removal failures in the shard
 delete path

deleteEcShardIdsForEachLocation still dropped os.Remove errors on the
.ecx/.ecj/.vif/sidecar cleanup. A surviving stale .ecx is the orphan-index
condition this path prevents, so route those through removeFileIfExists and
return the first real failure instead of reporting cleanup as success.
---
 weed/server/volume_grpc_erasure_coding.go | 30 ++++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/weed/server/volume_grpc_erasure_coding.go b/weed/server/volume_grpc_erasure_coding.go
index 53d6945c5..4d4d9dc2e 100644
--- a/weed/server/volume_grpc_erasure_coding.go
+++ b/weed/server/volume_grpc_erasure_coding.go
@@ -468,26 +468,38 @@ func deleteEcShardIdsForEachLocation(bName string, location *storage.DiskLocatio
 		// leaks. The per-shard-id delete that ec.rebuild uses for
 		// copied-survivor cleanup leaves shards behind, so this guard does not
 		// fire there.
-		removeBitrotSidecars(dataBaseFilename)
+		if err := removeBitrotSidecars(dataBaseFilename); err != nil {
+			return err
+		}
 		if location.IdxDirectory != location.Directory {
-			removeBitrotSidecars(indexBaseFilename)
+			if err := removeBitrotSidecars(indexBaseFilename); err != nil {
+				return err
+			}
 		}
 
 		if hasEcxFile {
 			// Remove .ecx/.ecj from both idx and data directories
-			// since they may be in either location depending on when -dir.idx was configured
-			if err := os.Remove(indexBaseFilename + ".ecx"); err != nil && !os.IsNotExist(err) {
-				return err
+			// since they may be in either location depending on when -dir.idx was configured.
+			// A surviving stale .ecx is the orphan-index condition this path prevents,
+			// so surface a real removal failure instead of reporting cleanup as success.
+			for _, p := range []string{indexBaseFilename + ".ecx", indexBaseFilename + ".ecj"} {
+				if err := removeFileIfExists(p); err != nil {
+					return err
+				}
 			}
-			os.Remove(indexBaseFilename + ".ecj")
 			if location.IdxDirectory != location.Directory {
-				os.Remove(dataBaseFilename + ".ecx")
-				os.Remove(dataBaseFilename + ".ecj")
+				for _, p := range []string{dataBaseFilename + ".ecx", dataBaseFilename + ".ecj"} {
+					if err := removeFileIfExists(p); err != nil {
+						return err
+					}
+				}
 			}
 
 			if !hasIdxFile {
 				// .vif is used for ec volumes and normal volumes
-				os.Remove(dataBaseFilename + ".vif")
+				if err := removeFileIfExists(dataBaseFilename + ".vif"); err != nil {
+					return err
+				}
 			}
 		}
 	}