Merge pull request #8475 from Iceber/fix_checkpoint_options_1.7

dmcgowan · web-flow · commit c8e99bfde846 · 2023-05-09T10:55:28.000-07:00
[release/1.7] runtime/shim: fix the nil checkpoint options
diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go
@@ -470,13 +470,12 @@ func (c *Container) Checkpoint(ctx context.Context, r *task.CheckpointTaskReques
 	if err != nil {
 		return err
 	}
-	var opts *options.CheckpointOptions
+
+	var opts options.CheckpointOptions
 	if r.Options != nil {
-		v, err := typeurl.UnmarshalAny(r.Options)
-		if err != nil {
+		if err := typeurl.UnmarshalTo(r.Options, &opts); err != nil {
 			return err
 		}
-		opts = v.(*options.CheckpointOptions)
 	}
 	return p.(*process.Init).Checkpoint(ctx, &process.CheckpointConfig{
 		Path:                     r.Path,

Original file line number	Diff line number	Diff line change
`@@ -470,13 +470,12 @@ func (c Container) Checkpoint(ctx context.Context, r task.CheckpointTaskReques`
`470`	`470`	`if err != nil {`
`471`	`471`	`return err`
`472`	`472`	`}`
`473`		`- var opts *options.CheckpointOptions`
	`473`	`+`
	`474`	`+ var opts options.CheckpointOptions`
`474`	`475`	`if r.Options != nil {`
`475`		`- v, err := typeurl.UnmarshalAny(r.Options)`
`476`		`- if err != nil {`
	`476`	`+ if err := typeurl.UnmarshalTo(r.Options, &opts); err != nil {`
`477`	`477`	`return err`
`478`	`478`	`}`
`479`		`- opts = v.(*options.CheckpointOptions)`
`480`	`479`	`}`
`481`	`480`	`return p.(*process.Init).Checkpoint(ctx, &process.CheckpointConfig{`
`482`	`481`	`Path: r.Path,`