X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c254acbd78ed50e1e9fec508fb9ec4164867dda..6a22686571417278c242a3fa1a7f1018594f8fc4:/lib/crunchrun/docker.go

diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index bb63526586..b402637e91 100644
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -4,6 +4,7 @@
 package crunchrun
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -17,7 +18,6 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerclient "github.com/docker/docker/client"
-	"golang.org/x/net/context"
 )
 
 // Docker daemon won't let you set a limit less than ~10 MiB
@@ -34,7 +34,7 @@ const DockerAPIVersion = "1.35"
 // Number of consecutive "inspect container" failures before
 // concluding Docker is unresponsive, giving up, and cancelling the
 // container.
-const dockerWatchdogThreshold = 3
+const dockerWatchdogThreshold = 5
 
 type dockerExecutor struct {
 	containerUUID    string
@@ -52,7 +52,7 @@ func newDockerExecutor(containerUUID string, logf func(string, ...interface{}),
 	// currently the minimum version we want to support.
 	client, err := dockerclient.NewClient(dockerclient.DefaultDockerHost, DockerAPIVersion, nil, nil)
 	if watchdogInterval < 1 {
-		watchdogInterval = time.Minute
+		watchdogInterval = time.Minute * 2
 	}
 	return &dockerExecutor{
 		containerUUID:    containerUUID,