Skip to content

[release/1.7] bump typeurl to v2.1.1#8495

Merged
estesp merged 1 commit intocontainerd:release/1.7from
Iceber:bump_typeurl_1.7
May 9, 2023
Merged

[release/1.7] bump typeurl to v2.1.1#8495
estesp merged 1 commit intocontainerd:release/1.7from
Iceber:bump_typeurl_1.7

Conversation

@Iceber
Copy link
Copy Markdown
Member

@Iceber Iceber commented May 9, 2023 •
edited
Loading

(cherry picked from commit ecb693e)

cherry-pick: #8494

Note: taskServer.Checkpoint of containerd-shim-runc-* v1.7.0 may panic

containerd/runtime/v2/runc/container.go

Lines 468 to 479 in e39c5c4

func (c *Container) Checkpoint(ctx context.Context, r *task.CheckpointTaskRequest) error {
p, err := c.Process("")
if err != nil {
return err
}
var opts *options.CheckpointOptions
if r.Options != nil {
v, err := typeurl.UnmarshalAny(r.Options)
if err != nil {
return err
}
opts = v.(*options.CheckpointOptions)

Due to #8392, v1.7.0 containerd will not access shim's Checkpoint, but other versions (<= v1.6.* and >= v1.7.1) may cause panic for v1.7.0 shim

shim v1.7.1+ that includes this pr will not panic due to this issue when accessing taskServer.Checkpoint

@Iceber
bump typeurl to v2.1.1
0e0532e 
Signed-off-by: Iceber Gu <[email protected]>
(cherry picked from commit ecb693e)
Signed-off-by: Iceber Gu <[email protected]>
@estesp estesp merged commit 74ce87e into containerd:release/1.7 May 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Iceber @estesp @AkihiroSuda