jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #219 from boucher/criu-logs 

Add the criu log file path to the failure message.
This commit is contained in:
Mrunal Patel 2015-08-24 08:21:24 -07:00
parent e7663a673e 8c812d0f50
commit ca2f4925c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainer/container_linux.go
View File

@ -568,6 +568,7 @@ func (c *linuxContainer) criuSwrk(process *Process, req *criurpc.CriuReq, opts *
return err return err
} }
logPath := filepath.Join(opts.WorkDirectory, req.GetOpts().GetLogFile())
criuClient := os.NewFile(uintptr(fds[0]), "criu-transport-client") criuClient := os.NewFile(uintptr(fds[0]), "criu-transport-client")
criuServer := os.NewFile(uintptr(fds[1]), "criu-transport-server") criuServer := os.NewFile(uintptr(fds[1]), "criu-transport-server")
defer criuClient.Close() defer criuClient.Close()
@ -631,7 +632,8 @@ func (c *linuxContainer) criuSwrk(process *Process, req *criurpc.CriuReq, opts *
return err return err
} }
if !resp.GetSuccess() { if !resp.GetSuccess() {
return fmt.Errorf("criu failed: type %s errno %d", req.GetType().String(), resp.GetCrErrno()) typeString := req.GetType().String()
return fmt.Errorf("criu failed: type %s errno %d\nlog file: %s", typeString, resp.GetCrErrno(), logPath)
} }
t := resp.GetType() t := resp.GetType()
@ -671,7 +673,7 @@ func (c *linuxContainer) criuSwrk(process *Process, req *criurpc.CriuReq, opts *
return err return err
} }
if !st.Success() { if !st.Success() {
return fmt.Errorf("criu failed: %s", st.String()) return fmt.Errorf("criu failed: %s\nlog file: %s", st.String(), logPath)
} }
return nil return nil
} }