support to syncfs after pull by using diff plugin

ningmingxiao · tboevil · commit 8bc21cba7516 · 2025-01-23T14:07:48.000+08:00
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn> (cherry picked from commit 0e4f210) Signed-off-by: Qiyuan Liang <qiyuan.liang@smartx.com>
diff --git a/services/diff/local.go b/services/diff/local.go
@@ -41,6 +41,10 @@ type config struct {
 	// correct output, allowing any ordering to be used to prefer
 	// more optimimal implementations.
 	Order []string `toml:"default"`
+	// sync_fs is an experimental setting. It's to force sync
+	// filesystem during unpacking to ensure that data integrity.
+	// It is effective for all containerd client.
+	SyncFs bool `toml:"sync_fs"`
 }
 
 type differ interface {
@@ -61,7 +65,7 @@ func init() {
 			if err != nil {
 				return nil, err
 			}
-
+			syncFs := ic.Config.(*config).SyncFs
 			orderedNames := ic.Config.(*config).Order
 			ordered := make([]differ, len(orderedNames))
 			for i, n := range orderedNames {
@@ -82,13 +86,15 @@ func init() {
 
 			return &local{
 				differs: ordered,
+				syncfs:  syncFs,
 			}, nil
 		},
 	})
 }
 
 type local struct {
 	differs []differ
+	syncfs  bool
 }
 
 var _ diffapi.DiffClient = &local{}
@@ -109,6 +115,9 @@ func (l *local) Apply(ctx context.Context, er *diffapi.ApplyRequest, _ ...grpc.C
 		}
 		opts = append(opts, diff.WithPayloads(payloads))
 	}
+	if l.syncfs {
+		er.SyncFs = true
+	}
 	opts = append(opts, diff.WithSyncFs(er.SyncFs))
 
 	for _, differ := range l.differs {
diff --git a/services/diff/service_unix.go b/services/diff/service_unix.go
@@ -19,5 +19,6 @@
 package diff
 
 var defaultDifferConfig = &config{
-	Order: []string{"walking"},
+	Order:  []string{"walking"},
+	SyncFs: false,
 }
diff --git a/services/diff/service_windows.go b/services/diff/service_windows.go
@@ -17,5 +17,6 @@
 package diff
 
 var defaultDifferConfig = &config{
-	Order: []string{"windows", "windows-lcow"},
+	Order:  []string{"windows", "windows-lcow"},
+	SyncFs: false,
 }

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@`
`19`	`19`	`package diff`
`20`	`20`
`21`	`21`	`var defaultDifferConfig = &config{`
`22`		`- Order: []string{"walking"},`
	`22`	`+ Order: []string{"walking"},`
	`23`	`+ SyncFs: false,`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@`
`17`	`17`	`package diff`
`18`	`18`
`19`	`19`	`var defaultDifferConfig = &config{`
`20`		`- Order: []string{"windows", "windows-lcow"},`
	`20`	`+ Order: []string{"windows", "windows-lcow"},`
	`21`	`+ SyncFs: false,`
`21`	`22`	`}`