From b62cced7f4099204fcdde8a89bd9d6e828fb405a Mon Sep 17 00:00:00 2001 From: Zhuoyu Tie Date: Fri, 8 Apr 2022 17:06:08 +0800 Subject: [PATCH] runtime: no need to write virtiofsd error to log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The scanner reads nothing from viriofsd stderr pipe, because param '--syslog' rediercts stderr to syslog. So there is no need to write scanner.Text() to kata log Fixes: #4063 Signed-off-by: Zhuoyu Tie (cherry picked from commit 6e79042aa06197e186ad9ba65d3c23522dce4944) Signed-off-by: Fabiano Fidêncio --- src/runtime/virtcontainers/virtiofsd.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/runtime/virtcontainers/virtiofsd.go b/src/runtime/virtcontainers/virtiofsd.go index 6ad0d01cfc..b4c09cfd29 100644 --- a/src/runtime/virtcontainers/virtiofsd.go +++ b/src/runtime/virtcontainers/virtiofsd.go @@ -6,7 +6,6 @@ package virtcontainers import ( - "bufio" "context" "fmt" "net" @@ -136,24 +135,14 @@ func (v *virtiofsd) Start(ctx context.Context, onQuit onQuitFunc) (int, error) { v.Logger().WithField("path", v.path).Info() v.Logger().WithField("args", strings.Join(args, " ")).Info() - stderr, err := cmd.StderrPipe() - if err != nil { - return pid, err - } if err = utils.StartCmd(cmd); err != nil { return pid, err } - // Monitor virtiofsd's stderr and stop sandbox if virtiofsd quits go func() { - scanner := bufio.NewScanner(stderr) - for scanner.Scan() { - v.Logger().WithField("source", "virtiofsd").Info(scanner.Text()) - } - v.Logger().Info("virtiofsd quits") - // Wait to release resources of virtiofsd process cmd.Process.Wait() + v.Logger().Info("virtiofsd quits") if onQuit != nil { onQuit() }