Merge pull request #2432 from crosbymichael/ttrpc2

mlaventure · web-flow · commit 4e64dcce85db · 2018-07-02T13:37:50.000-07:00
Update ttrpc to 94dde388801693c54f88a6596f713b51a8
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -172,7 +172,7 @@ func serve(server *ttrpc.Server, path string) error {
 	logrus.WithField("socket", path).Debug("serving api on unix socket")
 	go func() {
 		defer l.Close()
-		if err := server.Serve(l); err != nil &&
+		if err := server.Serve(context.Background(), l); err != nil &&
 			!strings.Contains(err.Error(), "use of closed network connection") {
 			logrus.WithError(err).Fatal("containerd-shim: ttrpc server failure")
 		}
diff --git a/vendor.conf b/vendor.conf
@@ -37,7 +37,7 @@ github.com/Microsoft/hcsshim v0.6.11
 github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
-github.com/containerd/ttrpc fa6c68143601db58b3636ee9948aad2fe08ed1ea
+github.com/containerd/ttrpc 94dde388801693c54f88a6596f713b51a8b30b2d
 github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
 gotest.tools v2.1.0
 github.com/google/go-cmp v0.1.0
diff --git a/vendor/github.com/containerd/ttrpc/server.go b/vendor/github.com/containerd/ttrpc/server.go

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func serve(server *ttrpc.Server, path string) error {`
`172`	`172`	`logrus.WithField("socket", path).Debug("serving api on unix socket")`
`173`	`173`	`go func() {`
`174`	`174`	`defer l.Close()`
`175`		`- if err := server.Serve(l); err != nil &&`
	`175`	`+ if err := server.Serve(context.Background(), l); err != nil &&`
`176`	`176`	`!strings.Contains(err.Error(), "use of closed network connection") {`
`177`	`177`	`logrus.WithError(err).Fatal("containerd-shim: ttrpc server failure")`
`178`	`178`	`}`