mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-29 08:47:56 +00:00
qemu: print virtiofsd logs when debug is on
To help trace virtiofsd issues. Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
parent
90539ac31b
commit
d0aae80f55
@ -598,10 +598,16 @@ func (q *qemu) startSandbox(timeout int) error {
|
||||
// connection with QEMU closes. Therefore we do not keep track
|
||||
// of this child process after returning from this function.
|
||||
sourcePath := filepath.Join(kataHostSharedDir, q.id)
|
||||
cmd := exec.Command(q.config.VirtioFSDaemon,
|
||||
"-o", "vhost_user_socket="+sockPath,
|
||||
"-o", "source="+sourcePath,
|
||||
"-o", "cache="+q.config.VirtioFSCache)
|
||||
args := []string{
|
||||
"-o", "vhost_user_socket=" + sockPath,
|
||||
"-o", "source=" + sourcePath,
|
||||
"-o", "cache=" + q.config.VirtioFSCache}
|
||||
if q.config.Debug {
|
||||
args = append(args, "-d")
|
||||
} else {
|
||||
args = append(args, "-f")
|
||||
}
|
||||
cmd := exec.Command(q.config.VirtioFSDaemon, args...)
|
||||
stderr, err := cmd.StderrPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
@ -621,16 +627,24 @@ func (q *qemu) startSandbox(timeout int) error {
|
||||
timeStart := time.Now()
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stderr)
|
||||
var sent bool
|
||||
for scanner.Scan() {
|
||||
if strings.Contains(scanner.Text(), "Waiting for vhost-user socket connection...") {
|
||||
if q.config.Debug {
|
||||
q.Logger().WithField("source", "virtiofsd").Debug(scanner.Text())
|
||||
}
|
||||
if !sent && strings.Contains(scanner.Text(), "Waiting for vhost-user socket connection...") {
|
||||
sockReady <- nil
|
||||
return
|
||||
sent = true
|
||||
}
|
||||
}
|
||||
if err := scanner.Err(); err != nil {
|
||||
sockReady <- err
|
||||
if !sent {
|
||||
if err := scanner.Err(); err != nil {
|
||||
sockReady <- err
|
||||
} else {
|
||||
sockReady <- fmt.Errorf("virtiofsd did not announce socket connection")
|
||||
}
|
||||
}
|
||||
sockReady <- fmt.Errorf("virtiofsd did not announce socket connection")
|
||||
q.Logger().Info("virtiofsd quits")
|
||||
}()
|
||||
timeoutDuration := time.Duration(timeout) * time.Second
|
||||
select {
|
||||
|
Loading…
Reference in New Issue
Block a user