14807: Don't send SIGKILL to crunch-run processes.

[arvados.git] / lib / dispatchcloud / worker / pool.go

diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index d13e29c1e89487df597a387f11129a6c7535e48b..81a658535ea593a7a0a0c2d9231fd66f3055bdbd 100644 (file)
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -69,7 +69,6 @@ const (
        defaultTimeoutProbe       = time.Minute * 10
        defaultTimeoutShutdown    = time.Second * 10
        defaultTimeoutTERM        = time.Minute * 2
-       defaultTimeoutKILL        = time.Second * 20
        defaultTimeoutSignal      = time.Second * 5
 
        // Time after a quota error to try again anyway, even if no
@@ -109,7 +108,6 @@ func NewPool(logger logrus.FieldLogger, arvClient *arvados.Client, reg *promethe
                timeoutProbe:       duration(cluster.CloudVMs.TimeoutProbe, defaultTimeoutProbe),
                timeoutShutdown:    duration(cluster.CloudVMs.TimeoutShutdown, defaultTimeoutShutdown),
                timeoutTERM:        duration(cluster.Dispatch.TimeoutTERM, defaultTimeoutTERM),
-               timeoutKILL:        duration(cluster.Dispatch.TimeoutKILL, defaultTimeoutKILL),
                timeoutSignal:      duration(cluster.Dispatch.TimeoutSignal, defaultTimeoutSignal),
                installPublicKey:   installPublicKey,
                stop:               make(chan bool),
@@ -143,7 +141,6 @@ type Pool struct {
        timeoutProbe       time.Duration
        timeoutShutdown    time.Duration
        timeoutTERM        time.Duration
-       timeoutKILL        time.Duration
        timeoutSignal      time.Duration
        installPublicKey   ssh.PublicKey