[ARVADOS] updated: 2.1.0-228-gdcbf53c77
Git user
git at public.arvados.org
Wed Dec 30 22:45:54 UTC 2020
Summary of changes:
lib/dispatchcloud/node_size.go | 2 +-
sdk/go/arvados/container.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
via dcbf53c77d06485cdaa28cf25383cff6d3c7bb39 (commit)
from 22895df84dadaa0c2101443f765a3436b0282643 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit dcbf53c77d06485cdaa28cf25383cff6d3c7bb39
Author: Nico Cesar <nico at nicocesar.com>
Date: Wed Dec 30 17:45:05 2020 -0500
preemptible is either explicit true or false, or nil (cluster config)
Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>
diff --git a/lib/dispatchcloud/node_size.go b/lib/dispatchcloud/node_size.go
index fd0486086..e335e9255 100644
--- a/lib/dispatchcloud/node_size.go
+++ b/lib/dispatchcloud/node_size.go
@@ -105,7 +105,7 @@ func ChooseInstanceType(cc *arvados.Cluster, ctr *arvados.Container) (best arvad
case int64(it.Scratch) < needScratch:
case int64(it.RAM) < needRAM:
case it.VCPUs < needVCPUs:
- case it.Preemptible != ctr.SchedulingParameters.Preemptible:
+ case it.Preemptible != *ctr.SchedulingParameters.Preemptible:
case it.Price == best.Price && (it.RAM < best.RAM || it.VCPUs < best.VCPUs):
// Equal price, but worse specs
default:
diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index 3ff7c5205..66c7a478f 100644
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -99,7 +99,7 @@ type RuntimeConstraints struct {
// such as Partitions
type SchedulingParameters struct {
Partitions []string `json:"partitions"`
- Preemptible bool `json:"preemptible"`
+ Preemptible *bool `json:"preemptible"`
MaxRunTime int `json:"max_run_time"`
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list