packages/kubernetes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!79 [sync] PR-76: add log and modify timeout

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-11-02 02:19:38 +00:00 committed by Gitee
commit f76b6fa495
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0009-timeout-wait-backend-to-frontend-complete.patch
View File

@ -1,24 +1,25 @@
From 99ca0fbb527b3c3137d8ea16aa82db009517adf0 Mon Sep 17 00:00:00 2001 From dda1aed8f9655c9cac813a3633b27bacdce9af88 Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com> From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Tue, 1 Nov 2022 15:34:16 +0800 Date: Tue, 1 Nov 2022 15:34:16 +0800
Subject: [PATCH] timeout wait backend to frontend complete Subject: [PATCH] timeout wait backend to frontend complete
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
--- ---
pkg/kubelet/cri/streaming/remotecommand/proxy.go | 5 +++++ pkg/kubelet/cri/streaming/remotecommand/proxy.go | 6 ++++++
1 file changed, 5 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/pkg/kubelet/cri/streaming/remotecommand/proxy.go b/pkg/kubelet/cri/streaming/remotecommand/proxy.go diff --git a/pkg/kubelet/cri/streaming/remotecommand/proxy.go b/pkg/kubelet/cri/streaming/remotecommand/proxy.go
index f21629af..65860c87 100644 index f21629af..c14ea8dd 100644
--- a/pkg/kubelet/cri/streaming/remotecommand/proxy.go --- a/pkg/kubelet/cri/streaming/remotecommand/proxy.go
+++ b/pkg/kubelet/cri/streaming/remotecommand/proxy.go +++ b/pkg/kubelet/cri/streaming/remotecommand/proxy.go
@@ -129,6 +129,11 @@ func ProxyToWebSocket(w http.ResponseWriter, r *http.Request, url *url.URL, opts @@ -129,6 +129,12 @@ func ProxyToWebSocket(w http.ResponseWriter, r *http.Request, url *url.URL, opts
case <-frontendResizeToBackendComplete: case <-frontendResizeToBackendComplete:
} }
+ select { + select {
+ case <-backendToFrontendComplete: + case <-backendToFrontendComplete:
+ case <-time.Tick(5 * time.Second): + case <-time.Tick(300 * time.Second):
+ klog.Errorf("Wait backend to frontend complete timeout")
+ } + }
+ +
if errConnection != nil { if errConnection != nil {

5
kubernetes.spec
View File

@ -3,7 +3,7 @@
Name: kubernetes Name: kubernetes
Version: 1.20.2 Version: 1.20.2
Release: 11 Release: 12
Summary: Container cluster management Summary: Container cluster management
License: ASL 2.0 License: ASL 2.0
URL: https://k8s.io/kubernetes URL: https://k8s.io/kubernetes
@ -264,6 +264,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun kubelet kube-proxy %systemd_postun kubelet kube-proxy
%changelog %changelog
* Tue Nov 01 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 1.20.2-12
- DESC: add log and modify timeout
* Tue Nov 01 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 1.20.2-11 * Tue Nov 01 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 1.20.2-11
- DESC: timeout wait backend to frontend complete - DESC: timeout wait backend to frontend complete