Merge pull request #3293 from crosbymichael/atomic-delete

dmcgowan · web-flow · commit 30082abed3f7 · 2019-05-21T13:54:47.000-07:00
Improve atomic delete
diff --git a/runtime/v1/linux/bundle.go b/runtime/v1/linux/bundle.go
@@ -179,6 +179,9 @@ func atomicDelete(path string) error {
 	// create a hidden dir for an atomic removal
 	atomicPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".%s", filepath.Base(path)))
 	if err := os.Rename(path, atomicPath); err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
 		return err
 	}
 	return os.RemoveAll(atomicPath)
diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go
@@ -330,6 +330,10 @@ func (r *Runtime) loadTasks(ctx context.Context, ns string) ([]*Task, error) {
 			continue
 		}
 		id := path.Name()
+		// skip hidden directories
+		if len(id) > 0 && id[0] == '.' {
+			continue
+		}
 		bundle := loadBundle(
 			id,
 			filepath.Join(r.state, ns, id),
diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go
@@ -134,6 +134,9 @@ func atomicDelete(path string) error {
 	// create a hidden dir for an atomic removal
 	atomicPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".%s", filepath.Base(path)))
 	if err := os.Rename(path, atomicPath); err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
 		return err
 	}
 	return os.RemoveAll(atomicPath)
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
@@ -214,6 +214,10 @@ func (m *TaskManager) loadTasks(ctx context.Context) error {
 			continue
 		}
 		id := sd.Name()
+		// skip hidden directories
+		if len(id) > 0 && id[0] == '.' {
+			continue
+		}
 		bundle, err := LoadBundle(ctx, m.state, id)
 		if err != nil {
 			// fine to return error here, it is a programmer error if the context
