[ARVADOS] updated: 2.1.0-229-g34f9f86a5

[Git user]

Summary of changes:
 lib/dispatchcloud/node_size.go | 2 +-
 sdk/go/arvados/config.go       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  34f9f86a5433f51bc05c70613a6615f6c187756c (commit)
      from  dcbf53c77d06485cdaa28cf25383cff6d3c7bb39 (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 34f9f86a5433f51bc05c70613a6615f6c187756c
Author: Nico Cesar <nico at nicocesar.com>
Date:   Wed Dec 30 19:25:31 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 e335e9255..7278b78d2 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 ctr.SchedulingParameters && (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/config.go b/sdk/go/arvados/config.go
index a8d601d5f..194f7e6c6 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -395,7 +395,7 @@ type InstanceType struct {
 	IncludedScratch ByteSize
 	AddedScratch    ByteSize
 	Price           float64
-	Preemptible     bool
+	Preemptible     *bool
 }
 
 type ContainersConfig struct {

-----------------------------------------------------------------------


hooks/post-receive
--