feat: make overlay sync removal configurable

cardyok · fuweid · commit 8804a27d7227 · 2023-08-24T09:02:59.000+08:00
Signed-off-by: Cardy.Tang <zuniorone@gmail.com> (cherry picked from commit b9f2e48) Signed-off-by: Wei Fu <fuweid89@gmail.com>
diff --git a/snapshots/overlay/plugin/plugin.go b/snapshots/overlay/plugin/plugin.go
@@ -31,6 +31,7 @@ type Config struct {
 	// Root directory for the plugin
 	RootPath      string `toml:"root_path"`
 	UpperdirLabel bool   `toml:"upperdir_label"`
+	SyncRemove    bool   `toml:"sync_remove"`
 }
 
 func init() {
@@ -55,9 +56,12 @@ func init() {
 			if config.UpperdirLabel {
 				oOpts = append(oOpts, overlay.WithUpperdirLabel)
 			}
+			if !config.SyncRemove {
+				oOpts = append(oOpts, overlay.AsynchronousRemove)
+			}
 
 			ic.Meta.Exports["root"] = root
-			return overlay.NewSnapshotter(root, append(oOpts, overlay.AsynchronousRemove)...)
+			return overlay.NewSnapshotter(root, oOpts...)
 		},
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type Config struct {`
`31`	`31`	`// Root directory for the plugin`
`32`	`32`	RootPath string `toml:"root_path"`
`33`	`33`	UpperdirLabel bool `toml:"upperdir_label"`
	`34`	+ SyncRemove bool `toml:"sync_remove"`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`func init() {`
`@@ -55,9 +56,12 @@ func init() {`
`55`	`56`	`if config.UpperdirLabel {`
`56`	`57`	`oOpts = append(oOpts, overlay.WithUpperdirLabel)`
`57`	`58`	`}`
	`59`	`+ if !config.SyncRemove {`
	`60`	`+ oOpts = append(oOpts, overlay.AsynchronousRemove)`
	`61`	`+ }`
`58`	`62`
`59`	`63`	`ic.Meta.Exports["root"] = root`
`60`		`- return overlay.NewSnapshotter(root, append(oOpts, overlay.AsynchronousRemove)...)`
	`64`	`+ return overlay.NewSnapshotter(root, oOpts...)`
`61`	`65`	`},`
`62`	`66`	`})`
`63`	`67`	`}`