From 6a79d25e8c5a1ecd89171ec66a3d3e71ca9c263b Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Wed, 14 Jun 2017 07:32:37 -0700 Subject: [PATCH 1/2] lint: Increase lint timeout to 600 seconds Signed-off-by: Mrunal Patel --- .tool/lint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool/lint b/.tool/lint index cf321d5c..eac80e98 100755 --- a/.tool/lint +++ b/.tool/lint @@ -19,5 +19,5 @@ for d in $(find . -type d -not -iwholename '*.git*' -a -not -iname '.tool' -a -n --cyclo-over=80 \ --dupl-threshold=100 \ --tests \ - --deadline=120s "${d}" + --deadline=600s "${d}" done From 62c9caeb83619bd2884d4498e06cf4a56a1d6f46 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Wed, 14 Jun 2017 07:33:07 -0700 Subject: [PATCH 2/2] oci: Add debugs for container create failures This makes it easier to debug container creation failures by looking at cri-o logs. Signed-off-by: Mrunal Patel --- oci/oci.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oci/oci.go b/oci/oci.go index b1091601..5eb8339e 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -180,7 +180,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error { if ss.err != nil { 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 := "" if c.terminal { errorMessage = stderrBuf.String() @@ -194,8 +194,10 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error { if ss.si.Pid == -1 { if errorMessage != "" { + logrus.Debugf("Container creation error: %s", errorMessage) return fmt.Errorf("container create failed: %s", errorMessage) } + logrus.Debugf("Container creation failed") return fmt.Errorf("container create failed") } case <-time.After(ContainerCreateTimeout):