47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 55e0671ff64532964c2de038d98be0e6a73bcfe7 Mon Sep 17 00:00:00 2001
|
|
From: Georgi Sabev <georgethebeatle@gmail.com>
|
|
Date: Mon, 13 May 2019 16:21:04 +0100
|
|
Subject: [PATCH] Bump ttrpc
|
|
|
|
Co-authored-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
|
|
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
|
|
---
|
|
vendor.conf | 2 +-
|
|
vendor/github.com/containerd/ttrpc/server.go | 7 ++++++-
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/vendor.conf b/vendor.conf
|
|
index 0f76be3b0..35c887dde 100644
|
|
--- a/vendor.conf
|
|
+++ b/vendor.conf
|
|
@@ -36,7 +36,7 @@ github.com/Microsoft/go-winio v0.4.11
|
|
github.com/Microsoft/hcsshim v0.7.12
|
|
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
|
|
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
|
|
-github.com/containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
|
|
+github.com/containerd/ttrpc f82148331ad2181edea8f3f649a1f7add6c3f9c2
|
|
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
|
|
index 263cb4583..ab2fdf2fc 100644
|
|
--- a/vendor/github.com/containerd/ttrpc/server.go
|
|
+++ b/vendor/github.com/containerd/ttrpc/server.go
|
|
@@ -446,7 +446,12 @@ func (c *serverConn) run(sctx context.Context) {
|
|
// branch. Basically, it means that we are no longer receiving
|
|
// requests due to a terminal error.
|
|
recvErr = nil // connection is now "closing"
|
|
- if err != nil && err != io.EOF {
|
|
+ if err == io.EOF || err == io.ErrUnexpectedEOF {
|
|
+ // The client went away and we should stop processing
|
|
+ // requests, so that the client connection is closed
|
|
+ return
|
|
+ }
|
|
+ if err != nil {
|
|
logrus.WithError(err).Error("error receiving message")
|
|
}
|
|
case <-shutdown:
|
|
--
|
|
2.33.0
|
|
|