X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cd020c016106fbe844501c5f434c16f4def4e08d..41365ac598721e31fc88c462934e0a06cafe2aae:/lib/dispatchcloud/worker/pool.go

diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index d13e29c1e8..81a658535e 100644
--- 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