remove temporary paths at one place

minio · Feb 26, 2022 · c33ec02 · c33ec02
1 parent e929e82
commit c33ec02
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pkg/dperf/perf.go b/pkg/dperf/perf.go
@@ -46,11 +46,6 @@ func mustGetUUID() string {
 
 func (d *DrivePerf) runTests(ctx context.Context, path string) (dr *DrivePerfResult) {
 	tmpPath := filepath.Join(path, ".writable-check.tmp")
-	defer func() {
-		if dr.Error == nil {
-			os.RemoveAll(dr.Path)
-		}
-	}()
 
 	writeThroughput, err := d.runWriteTest(ctx, tmpPath)
 	if err != nil {
@@ -101,6 +96,10 @@ func (d *DrivePerf) Run(ctx context.Context, paths ...string) ([]*DrivePerfResul
 		wg.Wait()
 	}
 
+	for _, res := range results {
+		os.RemoveAll(res.Path)
+	}
+
 	sort.Slice(results, func(i, j int) bool {
 		return results[i].ReadThroughput > results[j].ReadThroughput
 	})