Skip to content

Commit 13549f7

Browse files
crosbymichaelcrosbymichael
committed
Abstract to SocketAddress
This updates some methods for cross platform use as well as unifying _unix files. Signed-off-by: Michael Crosby <[email protected]>
1 parent 965cca6 commit 13549f7

9 files changed

+117
-234
lines changed

‎runtime/v2/runc/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func (s *service) StartShim(ctx context.Context, id, containerdBinary, container
136136
if err != nil {
137137
return "", err
138138
}
139-
address, err := shim.AbstractAddress(ctx, id)
139+
address, err := shim.SocketAddress(ctx, id)
140140
if err != nil {
141141
return "", err
142142
}

‎runtime/v2/shim/shim_darwin.go

+1-17
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,9 @@
1818

1919
package shim
2020

21-
import (
22-
"os"
23-
"os/signal"
24-
25-
"github.com/containerd/ttrpc"
26-
)
27-
28-
// setupSignals creates a new signal handler for all signals and sets the shim as a
29-
// sub-reaper so that the container processes are reparented
30-
func setupSignals() (chan os.Signal, error) {
31-
signals := make(chan os.Signal, 2048)
32-
signal.Notify(signals)
33-
return signals, nil
34-
}
21+
import "github.com/containerd/ttrpc"
3522

3623
func newServer() (*ttrpc.Server, error) {
37-
// for darwin, we omit the socket credentials because these syscalls are
38-
// slightly different. since we don't have darwin support yet, this can be
39-
// implemented later and the build can continue without issue.
4024
return ttrpc.NewServer()
4125
}
4226

‎runtime/v2/shim/shim_linux.go

-12
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,10 @@
1717
package shim
1818

1919
import (
20-
"os"
21-
"os/signal"
22-
2320
"github.com/containerd/containerd/sys"
2421
"github.com/containerd/ttrpc"
25-
"golang.org/x/sys/unix"
2622
)
2723

28-
// setupSignals creates a new signal handler for all signals and sets the shim as a
29-
// sub-reaper so that the container processes are reparented
30-
func setupSignals() (chan os.Signal, error) {
31-
signals := make(chan os.Signal, 32)
32-
signal.Notify(signals, unix.SIGTERM, unix.SIGINT, unix.SIGCHLD, unix.SIGPIPE)
33-
return signals, nil
34-
}
35-
3624
func newServer() (*ttrpc.Server, error) {
3725
return ttrpc.NewServer(ttrpc.WithServerHandshaker(ttrpc.UnixSocketRequireSameUser()))
3826
}

‎runtime/v2/shim/shim_nix.go

-102
This file was deleted.

‎runtime/v2/shim/shim_unix.go

+75-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build !linux,!windows,!darwin
1+
// +build !windows
22

33
/*
44
Copyright The containerd Authors.
@@ -19,24 +19,92 @@
1919
package shim
2020

2121
import (
22+
"bytes"
23+
"context"
24+
"net"
2225
"os"
26+
"os/exec"
2327
"os/signal"
28+
"syscall"
2429

25-
"github.com/containerd/ttrpc"
30+
"github.com/containerd/containerd/events"
31+
"github.com/containerd/containerd/namespaces"
32+
"github.com/containerd/typeurl"
33+
"github.com/pkg/errors"
34+
"github.com/sirupsen/logrus"
35+
"golang.org/x/sys/unix"
2636
)
2737

2838
// setupSignals creates a new signal handler for all signals and sets the shim as a
2939
// sub-reaper so that the container processes are reparented
3040
func setupSignals() (chan os.Signal, error) {
31-
signals := make(chan os.Signal, 2048)
32-
signal.Notify(signals)
41+
signals := make(chan os.Signal, 32)
42+
signal.Notify(signals, unix.SIGTERM, unix.SIGINT, unix.SIGCHLD, unix.SIGPIPE)
3343
return signals, nil
3444
}
3545

36-
func newServer() (*ttrpc.Server, error) {
37-
return ttrpc.NewServer(ttrpc.WithServerHandshaker(ttrpc.UnixSocketRequireSameUser()))
46+
func setupDumpStacks(dump chan<- os.Signal) {
47+
signal.Notify(dump, syscall.SIGUSR1)
3848
}
3949

40-
func subreaper() error {
50+
func serveListener(path string) (net.Listener, string, error) {
51+
var (
52+
l net.Listener
53+
err error
54+
)
55+
if path == "" {
56+
l, err = net.FileListener(os.NewFile(3, "socket"))
57+
path = "[inherited from parent]"
58+
} else {
59+
if len(path) > 106 {
60+
return nil, path, errors.Errorf("%q: unix socket path too long (> 106)", path)
61+
}
62+
l, err = net.Listen("unix", "\x00"+path)
63+
}
64+
if err != nil {
65+
return nil, path, err
66+
}
67+
return l, path, nil
68+
}
69+
70+
func handleSignals(logger *logrus.Entry, signals chan os.Signal) error {
71+
logger.Info("starting signal loop")
72+
for {
73+
select {
74+
case s := <-signals:
75+
switch s {
76+
case unix.SIGCHLD:
77+
if err := Reap(); err != nil {
78+
logger.WithError(err).Error("reap exit status")
79+
}
80+
case unix.SIGPIPE:
81+
}
82+
}
83+
}
84+
}
85+
86+
func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event events.Event) error {
87+
ns, _ := namespaces.Namespace(ctx)
88+
encoded, err := typeurl.MarshalAny(event)
89+
if err != nil {
90+
return err
91+
}
92+
data, err := encoded.Marshal()
93+
if err != nil {
94+
return err
95+
}
96+
cmd := exec.CommandContext(ctx, l.containerdBinaryPath, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
97+
cmd.Stdin = bytes.NewReader(data)
98+
c, err := Default.Start(cmd)
99+
if err != nil {
100+
return err
101+
}
102+
status, err := Default.Wait(cmd, c)
103+
if err != nil {
104+
return err
105+
}
106+
if status != 0 {
107+
return errors.New("failed to publish event")
108+
}
41109
return nil
42110
}

‎runtime/v2/shim/util_linux.go

-34
This file was deleted.

‎runtime/v2/shim/util_nix.go

-57
This file was deleted.

0 commit comments

Comments
 (0)