Merge pull request #2654 from nirs/remove-race

Suppress error if file is already deleted

Author: jandubois

pkg/instance/stop.go

@@ -93,7 +93,9 @@ func StopForcibly(inst *store.Instance) {
 	}
 
 	suffixesToBeRemoved := []string{".pid", ".sock", ".tmp"}
-	logrus.Infof("Removing %s under %q", inst.Dir, strings.ReplaceAll(strings.Join(suffixesToBeRemoved, " "), ".", "*."))
+	globPatterns := strings.ReplaceAll(strings.Join(suffixesToBeRemoved, " "), ".", "*.")
+	logrus.Infof("Removing %s under %q", globPatterns, inst.Dir)
+
 	fi, err := os.ReadDir(inst.Dir)
 	if err != nil {
 		logrus.Error(err)
@@ -105,7 +107,11 @@ func StopForcibly(inst *store.Instance) {
 			if strings.HasSuffix(path, suffix) {
 				logrus.Infof("Removing %q", path)
 				if err := os.Remove(path); err != nil {
-					logrus.Error(err)
+					if errors.Is(err, os.ErrNotExist) {
+						logrus.Debug(err.Error())
+					} else {
+						logrus.Error(err)
+					}
 				}
 			}
 		}