Skip to content

Commit 17ab11a

Browse files
crosbymichaelcrosbymichael
committed
Fixes for runtimev2 and checkpoint restore
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
1 parent 2a8e28a commit 17ab11a

File tree

11 files changed

+182
-19
lines changed

11 files changed

+182
-19
lines changed

‎Protobuild.toml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ ignore_files = [
5858
"gogoproto/gogo.proto"
5959
]
6060

61+
[[descriptors]]
62+
prefix = "github.com/containerd/containerd/runtime/v2/runc/options"
63+
target = "runtime/v2/runc/options/next.pb.txt"
64+
ignore_files = [
65+
"google/protobuf/descriptor.proto",
66+
"gogoproto/gogo.proto"
67+
]
68+
6169
[[descriptors]]
6270
prefix = "github.com/containerd/containerd/windows/hcsshimtypes"
6371
target = "windows/hcsshimtypes/next.pb.txt"

‎cmd/containerd-shim-runc-v1/main.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ import (
2424

2525
"github.com/containerd/containerd/runtime/v2/runc"
2626
"github.com/containerd/containerd/runtime/v2/shim"
27-
"github.com/sirupsen/logrus"
2827
)
2928

3029
func main() {
3130
if err := shim.Run(runc.New); err != nil {
32-
logrus.WithError(err).Error("shim run")
3331
fmt.Fprintf(os.Stderr, "containerd-shim-run-v1: %s\n", err)
3432
os.Exit(1)
3533
}

‎cmd/containerd/builtins_linux.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
_ "github.com/containerd/containerd/metrics/cgroups"
2222
_ "github.com/containerd/containerd/runtime/v1/linux"
2323
_ "github.com/containerd/containerd/runtime/v2"
24+
_ "github.com/containerd/containerd/runtime/v2/runc/options"
2425
_ "github.com/containerd/containerd/snapshots/native"
2526
_ "github.com/containerd/containerd/snapshots/overlay"
2627
_ "github.com/containerd/zfs"

‎cmd/ctr/commands/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ func AppContext(context *cli.Context) (gocontext.Context, gocontext.CancelFunc)
4646
}
4747

4848
// NewClient returns a new containerd client
49-
func NewClient(context *cli.Context) (*containerd.Client, gocontext.Context, gocontext.CancelFunc, error) {
50-
client, err := containerd.New(context.GlobalString("address"))
49+
func NewClient(context *cli.Context, opts ...containerd.ClientOpt) (*containerd.Client, gocontext.Context, gocontext.CancelFunc, error) {
50+
client, err := containerd.New(context.GlobalString("address"), opts...)
5151
if err != nil {
5252
return nil, nil, nil, err
5353
}

‎cmd/ctr/commands/run/run_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
4444
if err != nil {
4545
return nil, err
4646
}
47-
return client.NewContainer(ctx, id, containerd.WithCheckpoint(im, id))
47+
return client.NewContainer(ctx, id, containerd.WithCheckpoint(im, id), containerd.WithRuntime(context.String("runtime"), nil))
4848
}
4949

5050
var (

‎cmd/ctr/commands/tasks/checkpoint.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var checkpointCommand = cli.Command{
4848
if id == "" {
4949
return errors.New("container id must be provided")
5050
}
51-
client, ctx, cancel, err := commands.NewClient(context)
51+
client, ctx, cancel, err := commands.NewClient(context, containerd.WithDefaultRuntime(context.String("runtime")))
5252
if err != nil {
5353
return err
5454
}

‎runtime/v2/binary.go‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
package v2
1818

1919
import (
20+
"bytes"
2021
"context"
2122
"strings"
2223

2324
eventstypes "github.com/containerd/containerd/api/events"
2425
"github.com/containerd/containerd/events/exchange"
26+
"github.com/containerd/containerd/log"
2527
"github.com/containerd/containerd/runtime"
2628
client "github.com/containerd/containerd/runtime/v2/shim"
2729
"github.com/containerd/containerd/runtime/v2/task"
@@ -73,16 +75,26 @@ func (b *binary) Start(ctx context.Context) (*shim, error) {
7375
}
7476

7577
func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
78+
log.G(ctx).Info("cleaning up dead shim")
7679
cmd, err := client.Command(ctx, b.runtime, b.containerdAddress, b.bundle.Path, "-id", b.bundle.ID, "delete")
7780
if err != nil {
7881
return nil, err
7982
}
80-
out, err := cmd.CombinedOutput()
81-
if err != nil {
82-
return nil, errors.Wrapf(err, "%s", out)
83+
var (
84+
out = bytes.NewBuffer(nil)
85+
errb = bytes.NewBuffer(nil)
86+
)
87+
cmd.Stdout = out
88+
cmd.Stderr = errb
89+
if err := cmd.Run(); err != nil {
90+
return nil, errors.Wrapf(err, "%s", errb.String())
91+
}
92+
s := errb.String()
93+
if s != "" {
94+
log.G(ctx).Warnf("cleanup warnings %s", s)
8395
}
8496
var response task.DeleteResponse
85-
if err := response.Unmarshal(out); err != nil {
97+
if err := response.Unmarshal(out.Bytes()); err != nil {
8698
return nil, err
8799
}
88100
if err := b.bundle.Delete(); err != nil {

‎runtime/v2/runc/options/next.pb.txt‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
file {
2+
name: "github.com/containerd/containerd/runtime/v2/runc/options/oci.proto"
3+
package: "containerd.runc.v1"
4+
dependency: "gogoproto/gogo.proto"
5+
message_type {
6+
name: "Options"
7+
field {
8+
name: "no_pivot_root"
9+
number: 1
10+
label: LABEL_OPTIONAL
11+
type: TYPE_BOOL
12+
json_name: "noPivotRoot"
13+
}
14+
field {
15+
name: "no_new_keyring"
16+
number: 2
17+
label: LABEL_OPTIONAL
18+
type: TYPE_BOOL
19+
json_name: "noNewKeyring"
20+
}
21+
field {
22+
name: "shim_cgroup"
23+
number: 3
24+
label: LABEL_OPTIONAL
25+
type: TYPE_STRING
26+
json_name: "shimCgroup"
27+
}
28+
field {
29+
name: "io_uid"
30+
number: 4
31+
label: LABEL_OPTIONAL
32+
type: TYPE_UINT32
33+
json_name: "ioUid"
34+
}
35+
field {
36+
name: "io_gid"
37+
number: 5
38+
label: LABEL_OPTIONAL
39+
type: TYPE_UINT32
40+
json_name: "ioGid"
41+
}
42+
field {
43+
name: "binary_name"
44+
number: 6
45+
label: LABEL_OPTIONAL
46+
type: TYPE_STRING
47+
json_name: "binaryName"
48+
}
49+
field {
50+
name: "root"
51+
number: 7
52+
label: LABEL_OPTIONAL
53+
type: TYPE_STRING
54+
json_name: "root"
55+
}
56+
field {
57+
name: "criu_path"
58+
number: 8
59+
label: LABEL_OPTIONAL
60+
type: TYPE_STRING
61+
json_name: "criuPath"
62+
}
63+
field {
64+
name: "systemd_cgroup"
65+
number: 9
66+
label: LABEL_OPTIONAL
67+
type: TYPE_BOOL
68+
json_name: "systemdCgroup"
69+
}
70+
}
71+
message_type {
72+
name: "CheckpointOptions"
73+
field {
74+
name: "exit"
75+
number: 1
76+
label: LABEL_OPTIONAL
77+
type: TYPE_BOOL
78+
json_name: "exit"
79+
}
80+
field {
81+
name: "open_tcp"
82+
number: 2
83+
label: LABEL_OPTIONAL
84+
type: TYPE_BOOL
85+
json_name: "openTcp"
86+
}
87+
field {
88+
name: "external_unix_sockets"
89+
number: 3
90+
label: LABEL_OPTIONAL
91+
type: TYPE_BOOL
92+
json_name: "externalUnixSockets"
93+
}
94+
field {
95+
name: "terminal"
96+
number: 4
97+
label: LABEL_OPTIONAL
98+
type: TYPE_BOOL
99+
json_name: "terminal"
100+
}
101+
field {
102+
name: "file_locks"
103+
number: 5
104+
label: LABEL_OPTIONAL
105+
type: TYPE_BOOL
106+
json_name: "fileLocks"
107+
}
108+
field {
109+
name: "empty_namespaces"
110+
number: 6
111+
label: LABEL_REPEATED
112+
type: TYPE_STRING
113+
json_name: "emptyNamespaces"
114+
}
115+
field {
116+
name: "cgroups_mode"
117+
number: 7
118+
label: LABEL_OPTIONAL
119+
type: TYPE_STRING
120+
json_name: "cgroupsMode"
121+
}
122+
}
123+
message_type {
124+
name: "ProcessDetails"
125+
field {
126+
name: "exec_id"
127+
number: 1
128+
label: LABEL_OPTIONAL
129+
type: TYPE_STRING
130+
json_name: "execId"
131+
}
132+
}
133+
options {
134+
go_package: "github.com/containerd/containerd/runtime/v2/runc/options;options"
135+
}
136+
weak_dependency: 0
137+
syntax: "proto3"
138+
}

‎runtime/v2/runc/service.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,15 @@ func (s *service) Cleanup(ctx context.Context) (*taskAPI.DeleteResponse, error)
184184
if err != nil {
185185
return nil, err
186186
}
187-
runtime, _ := s.readRuntime(path)
188-
if runtime != "" {
189-
r := proc.NewRunc(proc.RuncRoot, path, ns, runtime, "", false)
190-
if err := r.Delete(ctx, s.id, &runcC.DeleteOpts{
191-
Force: true,
192-
}); err != nil {
193-
logrus.WithError(err).Warn("runc delete")
194-
}
187+
runtime, err := s.readRuntime(path)
188+
if err != nil {
189+
return nil, err
190+
}
191+
r := proc.NewRunc(proc.RuncRoot, path, ns, runtime, "", false)
192+
if err := r.Delete(ctx, s.id, &runcC.DeleteOpts{
193+
Force: true,
194+
}); err != nil {
195+
logrus.WithError(err).Warn("failed to remove runc container")
195196
}
196197
if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil {
197198
logrus.WithError(err).Warn("failed to cleanup rootfs mount")

‎runtime/v2/shim/shim.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
shimapi "github.com/containerd/containerd/runtime/v2/task"
3939
"github.com/containerd/ttrpc"
4040
"github.com/containerd/typeurl"
41+
"github.com/gogo/protobuf/proto"
4142
"github.com/pkg/errors"
4243
"github.com/sirupsen/logrus"
4344
"golang.org/x/sys/unix"
@@ -141,7 +142,7 @@ func Run(initFunc Init) error {
141142
if err != nil {
142143
return err
143144
}
144-
data, err := response.Marshal()
145+
data, err := proto.Marshal(response)
145146
if err != nil {
146147
return err
147148
}

0 commit comments

Comments
 (0)