github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-28 12:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9367 from microsoft/danmihai1/infinite-io-stream-copy-loop

Browse Source 
runtime: remove stream copy infinite loop
This commit is contained in:
Dan Mihai 2024-03-29 09:37:44 -07:00 committed by GitHub
commit 3a7dbcfc17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime/pkg/containerd-shim-v2/stream.go
View File

@ -10,9 +10,7 @@ import (
"fmt" "fmt"
"io" "io"
"net/url" "net/url"
"strings"
"sync" "sync"
"time"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -127,20 +125,7 @@ func ioCopy(shimLog *logrus.Entry, exitch, stdinCloser chan struct{}, tty *ttyIO
shimLog.Debug("stdout io stream copy started") shimLog.Debug("stdout io stream copy started")
p := bufPool.Get().(*[]byte) p := bufPool.Get().(*[]byte)
defer bufPool.Put(p) defer bufPool.Put(p)
io.CopyBuffer(tty.io.Stdout(), stdoutPipe, *p)
for {
var _, err = io.CopyBuffer(tty.io.Stdout(), stdoutPipe, *p)
if err != nil {
shimLog.Debug("stdout io stream copy error happens: error = %w", err.Error())
if !strings.Contains(err.Error(), "blocked by policy") {
break
}
time.Sleep(1 * time.Second)
} else {
break
}
}
if tty.io.Stdin() != nil { if tty.io.Stdin() != nil {
// close stdin to make the other routine stop // close stdin to make the other routine stop
tty.io.Stdin().Close() tty.io.Stdin().Close()