Merge pull request #4440 from yangzhao02/main

rata · web-flow · commit bb6aeedaecf9 · 2024-11-01T15:04:03.000+01:00
Terminate execution for criu that does not meet version requirements
diff --git a/libcontainer/criu_linux.go b/libcontainer/criu_linux.go
@@ -186,7 +186,7 @@ func criuNsToKey(t configs.NamespaceType) string {
 
 func (c *Container) handleCheckpointingExternalNamespaces(rpcOpts *criurpc.CriuOpts, t configs.NamespaceType) error {
 	if !c.criuSupportsExtNS(t) {
-		return nil
+		return fmt.Errorf("criu lacks support for external %s namespace during checkpointing process (old criu version?)", configs.NsName(t))
 	}
 
 	nsPath := c.config.Namespaces.PathOf(t)
@@ -246,7 +246,7 @@ func (c *Container) handleRestoringNamespaces(rpcOpts *criurpc.CriuOpts, extraFi
 
 func (c *Container) handleRestoringExternalNamespaces(rpcOpts *criurpc.CriuOpts, extraFiles *[]*os.File, t configs.NamespaceType) error {
 	if !c.criuSupportsExtNS(t) {
-		return nil
+		return fmt.Errorf("criu lacks support for external %s namespace during the restoration process (old criu version?)", configs.NsName(t))
 	}
 
 	nsPath := c.config.Namespaces.PathOf(t)

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ func criuNsToKey(t configs.NamespaceType) string {`
`186`	`186`
`187`	`187`	`func (c Container) handleCheckpointingExternalNamespaces(rpcOpts criurpc.CriuOpts, t configs.NamespaceType) error {`
`188`	`188`	`if !c.criuSupportsExtNS(t) {`
`189`		`- return nil`
	`189`	`+ return fmt.Errorf("criu lacks support for external %s namespace during checkpointing process (old criu version?)", configs.NsName(t))`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`nsPath := c.config.Namespaces.PathOf(t)`
`@@ -246,7 +246,7 @@ func (c Container) handleRestoringNamespaces(rpcOpts criurpc.CriuOpts, extraFi`
`246`	`246`
`247`	`247`	`func (c Container) handleRestoringExternalNamespaces(rpcOpts criurpc.CriuOpts, extraFiles []os.File, t configs.NamespaceType) error {`
`248`	`248`	`if !c.criuSupportsExtNS(t) {`
`249`		`- return nil`
	`249`	`+ return fmt.Errorf("criu lacks support for external %s namespace during the restoration process (old criu version?)", configs.NsName(t))`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`nsPath := c.config.Namespaces.PathOf(t)`