github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-08 18:39:16 +00:00
Code Issues Projects Releases Wiki Activity

fix spdy stream, conn deadlock.

Browse Source 
Kubernetes-commit: 94a297485bf39a6d69f316c257d351e9432b8cb5
This commit is contained in:
adamzhoul
2020-11-15 17:06:34 +08:00
committed by Kubernetes Publisher
parent e24efdc77f
commit 04adad44d6
2 changed files with 270 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/remotecommand/v2.go
View File

@@ -142,6 +142,10 @@ func (p *streamProtocolV2) copyStdout(wg *sync.WaitGroup) {
go func() {
defer runtime.HandleCrash()
defer wg.Done()
// make sure, packet in queue can be consumed.
// block in queue may lead to deadlock in conn.server
// issue: https://github.com/kubernetes/kubernetes/issues/96339
defer io.Copy(ioutil.Discard, p.remoteStdout)
if _, err := io.Copy(p.Stdout, p.remoteStdout); err != nil {
runtime.HandleError(err)
@@ -158,6 +162,7 @@ func (p *streamProtocolV2) copyStderr(wg *sync.WaitGroup) {
go func() {
defer runtime.HandleCrash()
defer wg.Done()
defer io.Copy(ioutil.Discard, p.remoteStderr)
if _, err := io.Copy(p.Stderr, p.remoteStderr); err != nil {
runtime.HandleError(err)