From 587a811d0941142329b4e6beb1a3cb1181a4d23c Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 10 Aug 2017 16:43:18 -0700 Subject: [PATCH] Check credentials when connecting to shim NewUnixSocketCredentials was actually never invoked before. Signed-off-by: Kenfe-Mickael Laventure --- cmd/containerd-shim/main_unix.go | 5 +++-- cmd/containerd-shim/shim_linux.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go index 90b1520fd..6b5d8010b 100644 --- a/cmd/containerd-shim/main_unix.go +++ b/cmd/containerd-shim/main_unix.go @@ -80,7 +80,7 @@ func main() { if err != nil { return err } - server := grpc.NewServer() + server := newServer() e, err := connectEvents(context.GlobalString("address")) if err != nil { return err @@ -182,9 +182,10 @@ func connect(address string, d func(string, time.Duration) (net.Conn, error)) (* gopts := []grpc.DialOption{ grpc.WithBlock(), grpc.WithInsecure(), - grpc.WithTimeout(100 * time.Second), + grpc.WithTimeout(60 * time.Second), grpc.WithDialer(d), grpc.FailOnNonTempDialError(true), + grpc.WithBackoffMaxDelay(3 * time.Second), } conn, err := grpc.Dial(dialAddress(address), gopts...) if err != nil { diff --git a/cmd/containerd-shim/shim_linux.go b/cmd/containerd-shim/shim_linux.go index 390a37037..7d6229621 100644 --- a/cmd/containerd-shim/shim_linux.go +++ b/cmd/containerd-shim/shim_linux.go @@ -33,7 +33,7 @@ func setupSignals() (chan os.Signal, error) { } func newServer() *grpc.Server { - return grpc.NewServer(grpc.Creds(NewUnixSocketCredentils(0, 0))) + return grpc.NewServer(grpc.Creds(NewUnixSocketCredentials(0, 0))) } type unixSocketCredentials struct { @@ -42,7 +42,7 @@ type unixSocketCredentials struct { serverName string } -func NewUnixSocketCredentils(uid, gid int) credentials.TransportCredentials { +func NewUnixSocketCredentials(uid, gid int) credentials.TransportCredentials { return &unixSocketCredentials{uid, gid, "locahost"} }