Skip to content

Commit 7e49c60

Browse files
crosbymichaelcrosbymichael
committed
Add shim start for shim creation
Signed-off-by: Michael Crosby <[email protected]>
1 parent da1b547 commit 7e49c60

13 files changed

+1339
-436
lines changed

‎runtime/v2/binary.go

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/*
2+
Copyright The containerd Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package v2
18+
19+
import (
20+
"context"
21+
"strings"
22+
23+
eventstypes "github.com/containerd/containerd/api/events"
24+
"github.com/containerd/containerd/events/exchange"
25+
"github.com/containerd/containerd/runtime"
26+
client "github.com/containerd/containerd/runtime/v2/shim"
27+
"github.com/containerd/containerd/runtime/v2/task"
28+
"github.com/containerd/ttrpc"
29+
"github.com/pkg/errors"
30+
)
31+
32+
func shimBinary(ctx context.Context, bundle *Bundle, runtime, containerdAddress string, events *exchange.Exchange, rt *runtime.TaskList) *binary {
33+
return &binary{
34+
bundle: bundle,
35+
runtime: runtime,
36+
containerdAddress: containerdAddress,
37+
events: events,
38+
rtTasks: rt,
39+
}
40+
}
41+
42+
type binary struct {
43+
runtime string
44+
containerdAddress string
45+
bundle *Bundle
46+
events *exchange.Exchange
47+
rtTasks *runtime.TaskList
48+
}
49+
50+
func (b *binary) Start(ctx context.Context) (*shim, error) {
51+
cmd, err := client.Command(ctx, b.runtime, b.containerdAddress, b.bundle.Path, "-id", b.bundle.ID, "start")
52+
if err != nil {
53+
return nil, err
54+
}
55+
out, err := cmd.CombinedOutput()
56+
if err != nil {
57+
return nil, errors.Wrapf(err, "%s", out)
58+
}
59+
address := strings.TrimSpace(string(out))
60+
conn, err := client.Connect(address, client.AnonDialer)
61+
if err != nil {
62+
return nil, err
63+
}
64+
client := ttrpc.NewClient(conn)
65+
client.OnClose(func() { conn.Close() })
66+
return &shim{
67+
bundle: b.bundle,
68+
client: client,
69+
task: task.NewTaskClient(client),
70+
events: b.events,
71+
rtTasks: b.rtTasks,
72+
}, nil
73+
}
74+
75+
func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
76+
cmd, err := client.Command(ctx, b.runtime, b.containerdAddress, b.bundle.Path, "-id", b.bundle.ID, "delete")
77+
if err != nil {
78+
return nil, err
79+
}
80+
out, err := cmd.CombinedOutput()
81+
if err != nil {
82+
return nil, errors.Wrapf(err, "%s", out)
83+
}
84+
var response task.DeleteResponse
85+
if err := response.Unmarshal(out); err != nil {
86+
return nil, err
87+
}
88+
if err := b.bundle.Delete(); err != nil {
89+
return nil, err
90+
}
91+
// remove self from the runtime task list
92+
// this seems dirty but it cleans up the API across runtimes, tasks, and the service
93+
b.rtTasks.Delete(ctx, b.bundle.ID)
94+
// shim will send the exit event
95+
b.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{
96+
ContainerID: b.bundle.ID,
97+
ExitStatus: response.ExitStatus,
98+
ExitedAt: response.ExitedAt,
99+
Pid: response.Pid,
100+
})
101+
return &runtime.Exit{
102+
Status: response.ExitStatus,
103+
Timestamp: response.ExitedAt,
104+
Pid: response.Pid,
105+
}, nil
106+
}

‎runtime/v2/manager.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,10 @@ import (
3333
"github.com/containerd/containerd/platforms"
3434
"github.com/containerd/containerd/plugin"
3535
"github.com/containerd/containerd/runtime"
36-
ptypes "github.com/gogo/protobuf/types"
3736
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3837
"github.com/pkg/errors"
3938
)
4039

41-
var empty = &ptypes.Empty{}
42-
4340
func init() {
4441
plugin.Register(&plugin.Registration{
4542
Type: plugin.RuntimePluginV2,
@@ -112,7 +109,8 @@ func (m *TaskManager) Create(ctx context.Context, id string, opts runtime.Create
112109
bundle.Delete()
113110
}
114111
}()
115-
shim, err := newShim(ctx, bundle, opts.Runtime, m.containerdAddress, m.events, m.tasks)
112+
b := shimBinary(ctx, bundle, opts.Runtime, m.containerdAddress, m.events, m.tasks)
113+
shim, err := b.Start(ctx)
116114
if err != nil {
117115
return nil, err
118116
}

‎runtime/v2/process.go

+15-8
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ func (p *process) ID() string {
4040
func (p *process) Kill(ctx context.Context, signal uint32, _ bool) error {
4141
_, err := p.shim.task.Kill(ctx, &task.KillRequest{
4242
Signal: signal,
43-
ID: p.id,
43+
ID: p.shim.ID(),
44+
ExecID: p.id,
4445
})
4546
if err != nil {
4647
return errdefs.FromGRPC(err)
@@ -50,7 +51,8 @@ func (p *process) Kill(ctx context.Context, signal uint32, _ bool) error {
5051

5152
func (p *process) State(ctx context.Context) (runtime.State, error) {
5253
response, err := p.shim.task.State(ctx, &task.StateRequest{
53-
ID: p.id,
54+
ID: p.shim.ID(),
55+
ExecID: p.id,
5456
})
5557
if err != nil {
5658
if errors.Cause(err) != ttrpc.ErrClosed {
@@ -86,7 +88,8 @@ func (p *process) State(ctx context.Context) (runtime.State, error) {
8688
// ResizePty changes the side of the process's PTY to the provided width and height
8789
func (p *process) ResizePty(ctx context.Context, size runtime.ConsoleSize) error {
8890
_, err := p.shim.task.ResizePty(ctx, &task.ResizePtyRequest{
89-
ID: p.id,
91+
ID: p.shim.ID(),
92+
ExecID: p.id,
9093
Width: size.Width,
9194
Height: size.Height,
9295
})
@@ -99,8 +102,9 @@ func (p *process) ResizePty(ctx context.Context, size runtime.ConsoleSize) error
99102
// CloseIO closes the provided IO pipe for the process
100103
func (p *process) CloseIO(ctx context.Context) error {
101104
_, err := p.shim.task.CloseIO(ctx, &task.CloseIORequest{
102-
ID: p.id,
103-
Stdin: true,
105+
ID: p.shim.ID(),
106+
ExecID: p.id,
107+
Stdin: true,
104108
})
105109
if err != nil {
106110
return errdefs.FromGRPC(err)
@@ -111,7 +115,8 @@ func (p *process) CloseIO(ctx context.Context) error {
111115
// Start the process
112116
func (p *process) Start(ctx context.Context) error {
113117
response, err := p.shim.task.Start(ctx, &task.StartRequest{
114-
ID: p.id,
118+
ID: p.shim.ID(),
119+
ExecID: p.id,
115120
})
116121
if err != nil {
117122
return errdefs.FromGRPC(err)
@@ -127,7 +132,8 @@ func (p *process) Start(ctx context.Context) error {
127132
// Wait on the process to exit and return the exit status and timestamp
128133
func (p *process) Wait(ctx context.Context) (*runtime.Exit, error) {
129134
response, err := p.shim.task.Wait(ctx, &task.WaitRequest{
130-
ID: p.id,
135+
ID: p.shim.ID(),
136+
ExecID: p.id,
131137
})
132138
if err != nil {
133139
return nil, errdefs.FromGRPC(err)
@@ -140,7 +146,8 @@ func (p *process) Wait(ctx context.Context) (*runtime.Exit, error) {
140146

141147
func (p *process) Delete(ctx context.Context) (*runtime.Exit, error) {
142148
response, err := p.shim.task.Delete(ctx, &task.DeleteRequest{
143-
ID: p.id,
149+
ID: p.shim.ID(),
150+
ExecID: p.id,
144151
})
145152
if err != nil {
146153
return nil, errdefs.FromGRPC(err)

0 commit comments

Comments
 (0)