vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #596 from mrunalp/ctr_create_debug

Browse source 
oci: Add debugs to print error message on create failure
This commit is contained in:
Antonio Murdaca 2017-06-14 18:17:41 +02:00 committed by GitHub
commit 00444753e7
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.tool/lint
View file

@ -19,5 +19,5 @@ for d in $(find . -type d -not -iwholename '*.git*' -a -not -iname '.tool' -a -n
--cyclo-over=80 \ --cyclo-over=80 \
--dupl-threshold=100 \ --dupl-threshold=100 \
--tests \ --tests \
--deadline=120s "${d}" --deadline=600s "${d}"
done done

4
oci/oci.go
View file

@ -180,7 +180,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error {
if ss.err != nil { if ss.err != nil {
return fmt.Errorf("error reading container (probably exited) json message: %v", ss.err) return fmt.Errorf("error reading container (probably exited) json message: %v", ss.err)
} }
logrus.Infof("Received container pid: %d", ss.si.Pid) logrus.Debugf("Received container pid: %d", ss.si.Pid)
errorMessage := "" errorMessage := ""
if c.terminal { if c.terminal {
errorMessage = stderrBuf.String() errorMessage = stderrBuf.String()
@ -194,8 +194,10 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error {
if ss.si.Pid == -1 { if ss.si.Pid == -1 {
if errorMessage != "" { if errorMessage != "" {
logrus.Debugf("Container creation error: %s", errorMessage)
return fmt.Errorf("container create failed: %s", errorMessage) return fmt.Errorf("container create failed: %s", errorMessage)
} }
logrus.Debugf("Container creation failed")
return fmt.Errorf("container create failed") return fmt.Errorf("container create failed")
} }
case <-time.After(ContainerCreateTimeout): case <-time.After(ContainerCreateTimeout):