Merge branch 'main' from arvados-workbench2.git

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

diff --git a/lib/dispatchcloud/worker/runner.go b/lib/dispatchcloud/worker/runner.go
index 29c4b8e0a36a3be2a721e1bc509335817e86842c..f22b8922ad42c06f44ff7651494b468911149b37 100644 (file)
--- a/lib/dispatchcloud/worker/runner.go
+++ b/lib/dispatchcloud/worker/runner.go
@@ -63,6 +63,9 @@ func newRemoteRunner(uuid string, wkr *worker) *remoteRunner {
                configData.Cluster = wkr.wp.cluster
                configData.KeepBuffers = bufs * wkr.instType.VCPUs
        }
+       if wkr.wp.cluster.Containers.CloudVMs.Driver == "ec2" && wkr.instType.Preemptible {
+               configData.EC2SpotCheck = true
+       }
        configJSON, err := json.Marshal(configData)
        if err != nil {
                panic(err)
@@ -135,7 +138,7 @@ func (rr *remoteRunner) Kill(reason string) {
                termDeadline := time.Now().Add(rr.timeoutTERM)
                t := time.NewTicker(rr.timeoutSignal)
                defer t.Stop()
-               for range t.C {
+               for ; ; <-t.C {
                        switch {
                        case rr.isClosed():
                                return