52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 99580e0aad981d8be11a0d8e7ad2c24130b2dc8d Mon Sep 17 00:00:00 2001
|
|
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
|
|
Date: Thu, 19 Jan 2023 10:52:41 -0800
|
|
Subject: [PATCH] Update TTRPC and Protobuild dependencies
|
|
|
|
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
|
|
---
|
|
vendor/github.com/containerd/ttrpc/server.go | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/vendor/github.com/containerd/ttrpc/server.go b/vendor/github.com/containerd/ttrpc/server.go
|
|
index ab2fdf2..7445d93 100644
|
|
--- a/vendor/github.com/containerd/ttrpc/server.go
|
|
+++ b/vendor/github.com/containerd/ttrpc/server.go
|
|
@@ -18,14 +18,15 @@ package ttrpc
|
|
|
|
import (
|
|
"context"
|
|
+ "errors"
|
|
"io"
|
|
"math/rand"
|
|
"net"
|
|
"sync"
|
|
"sync/atomic"
|
|
+ "syscall"
|
|
"time"
|
|
|
|
- "github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
@@ -446,14 +447,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 == io.EOF || err == io.ErrUnexpectedEOF {
|
|
+ if err == io.EOF || err == io.ErrUnexpectedEOF || errors.Is(err, syscall.ECONNRESET) {
|
|
// 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")
|
|
- }
|
|
+ logrus.WithError(err).Error("error receiving message")
|
|
case <-shutdown:
|
|
return
|
|
}
|
|
--
|
|
2.33.0
|
|
|