[ARVADOS] updated: 2.1.0-231-gedaa163c7

[Git user]

Summary of changes:
 lib/dispatchcloud/node_size.go               | 2 +-
 sdk/go/arvados/config.go                     | 2 +-
 sdk/go/arvados/container.go                  | 2 +-
 services/api/app/models/container_request.rb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

       via  edaa163c7c65c1a577a9744d7eee6cc1cd46ca6c (commit)
      from  30c06f38c84496df0954661e06c8e6d321697ef4 (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 edaa163c7c65c1a577a9744d7eee6cc1cd46ca6c
Author: Nico Cesar <nico at nicocesar.com>
Date:   Mon Jan 4 12:28:38 2021 -0500

    Making sure we have no pointers to Preemptible
    
    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 7278b78d2..fd0486086 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 ctr.SchedulingParameters && (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/config.go b/sdk/go/arvados/config.go
index 194f7e6c6..a8d601d5f 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 {
diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index 66c7a478f..3ff7c5205 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"`
 }
 
diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index 7012c1c32..0e650bbeb 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -107,7 +107,7 @@ class ContainerRequest < ArvadosModel
   AttrsSchedulingParametersDefaults = {
     "max_run_time"=>0,
     "partitions"=>[],
-    "preemptible"=>nil
+    "preemptible"=>false
   }
 
   def self.limit_index_columns_read

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


hooks/post-receive
--