containerd:symc some patches

(cherry picked from commit df5431744ecee9e4aeb33a52278fec636909cb42)

containerd.spec

@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 Version:        1.2.0
 Name:           containerd
-Release:        314
+Release:        315
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -72,6 +72,12 @@ install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr
 %{_bindir}/ctr
 
 %changelog
+* Thu Dec 21 2023 zhongjiawei<zhongjiawei1@huawei.com> - 1.2.0-315
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:sync some patches
+
 * Wed Nov 08 2023 zhongjiawei<zhongjiawei1@huawei.com> - 1.2.0-314
 - Type:bugfix
 - ID:NA

git-commit

@@ -1 +1 @@
-8e9edf2a5aa9a0e32d8c7c0c6100542001c6910c
+b57240907ae3e0f3f5251b6f28463ad61976baf4

patch/0107-containerd-Fix-missing-closed-fifo.patch

@@ -0,0 +1,38 @@
+From 1c93da5ded1b80338ae4014084ce005f89e20a94 Mon Sep 17 00:00:00 2001
+From: Shiming Zhang <wzshiming@foxmail.com>
+Date: Mon, 31 Oct 2022 17:18:27 +0800
+Subject: [PATCH] Fix missing closed fifo
+
+Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
+---
+ runtime/v1/shim/service_linux.go | 1 +
+ runtime/v2/runc/service_linux.go | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/runtime/v1/shim/service_linux.go b/runtime/v1/shim/service_linux.go
+index 307e20d..b8b85f6 100644
+--- a/runtime/v1/shim/service_linux.go
++++ b/runtime/v1/shim/service_linux.go
+@@ -54,6 +54,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
+ 			io.CopyBuffer(epollConsole, in, *bp)
+ 			// we need to shutdown epollConsole when pipe broken
+ 			epollConsole.Shutdown(p.epoller.CloseConsole)
++			in.Close()
+ 		}()
+ 	}
+ 
+diff --git a/runtime/v2/runc/service_linux.go b/runtime/v2/runc/service_linux.go
+index 195c230..de85993 100644
+--- a/runtime/v2/runc/service_linux.go
++++ b/runtime/v2/runc/service_linux.go
+@@ -54,6 +54,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
+ 			io.CopyBuffer(epollConsole, in, *bp)
+ 			// we need to shutdown epollConsole when pipe broken
+ 			epollConsole.Shutdown(p.epoller.CloseConsole)
++			in.Close()
+ 		}()
+ 	}
+ 
+-- 
+2.33.0
+

patch/0108-containerd-Update-TTRPC-and-Protobuild-dependencies.patch

@@ -0,0 +1,51 @@
+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
+

series.conf

@@ -114,4 +114,6 @@ patch/0105-containerd-fix-allow-attaching-to-any-combination-of-stdin-stdo.patch
 # sw_64
 sw64_patch/3000-bbolt-add-support-sw_64.patch
 patch/0106-containerd-bump-ttrpc.patch
+patch/0107-containerd-Fix-missing-closed-fifo.patch
+patch/0108-containerd-Update-TTRPC-and-Protobuild-dependencies.patch
 # end