55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
|
From 02d2ff546e0727d57bcd14b73aafcc23961b8304 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongjiawei <zhongjiawei1@huawei.com>
|
||
|
|
Date: Tue, 13 Dec 2022 11:22:07 +0800
|
||
|
|
Subject: [PATCH] containerd:Fix goroutine leak in Exec
|
||
|
|
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://github.com/containerd/containerd/commit/a05d175400b1145e5e6a735a6710579d181e7fb0
|
||
|
|
Signed-off-by: mcgowan <derek@mcg.dev>
|
||
|
|
---
|
||
|
|
.../pkg/kubelet/server/remotecommand/httpstream.go | 14 +++++++++++---
|
||
|
|
1 file changed, 11 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go
|
||
|
|
index 387ad3d..0da6f99 100644
|
||
|
|
--- a/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go
|
||
|
|
+++ b/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go
|
||
|
|
@@ -116,7 +116,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
|
||
|
|
|
||
|
|
if ctx.resizeStream != nil {
|
||
|
|
ctx.resizeChan = make(chan remotecommand.TerminalSize)
|
||
|
|
- go handleResizeEvents(ctx.resizeStream, ctx.resizeChan)
|
||
|
|
+ go handleResizeEvents(req.Context(), ctx.resizeStream, ctx.resizeChan)
|
||
|
|
}
|
||
|
|
|
||
|
|
return ctx, true
|
||
|
|
@@ -410,7 +410,7 @@ WaitForStreams:
|
||
|
|
// supportsTerminalResizing returns false because v1ProtocolHandler doesn't support it.
|
||
|
|
func (*v1ProtocolHandler) supportsTerminalResizing() bool { return false }
|
||
|
|
|
||
|
|
-func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalSize) {
|
||
|
|
+func handleResizeEvents(ctx gocontext.Context, stream io.Reader, channel chan<- remotecommand.TerminalSize) {
|
||
|
|
defer runtime.HandleCrash()
|
||
|
|
|
||
|
|
decoder := json.NewDecoder(stream)
|
||
|
|
@@ -419,7 +419,15 @@ func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalS
|
||
|
|
if err := decoder.Decode(&size); err != nil {
|
||
|
|
break
|
||
|
|
}
|
||
|
|
- channel <- size
|
||
|
|
+
|
||
|
|
+ select {
|
||
|
|
+ case channel <- size:
|
||
|
|
+ case <-ctx.Done():
|
||
|
|
+ // To avoid leaking this routine, exit if the http request finishes. This path
|
||
|
|
+ // would generally be hit if starting the process fails and nothing is started to
|
||
|
|
+ // ingest these resize events.
|
||
|
|
+ return
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.30.0
|
||
|
|
|