From 643b160f9af9a245607d4cbee488d08f8516df5e Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 5 Mar 2020 14:44:22 -0500 Subject: [PATCH] 16219: Load all fields needed to compute node size. Without ContainerImage and Mounts, the scratch size requirement can't be computed correctly. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/dispatchcloud/container/queue.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/dispatchcloud/container/queue.go b/lib/dispatchcloud/container/queue.go index a4a270dd10..d128c265f8 100644 --- a/lib/dispatchcloud/container/queue.go +++ b/lib/dispatchcloud/container/queue.go @@ -26,8 +26,9 @@ type APIClient interface { // A QueueEnt is an entry in the queue, consisting of a container // record and the instance type that should be used to run it. type QueueEnt struct { - // The container to run. Only the UUID, State, Priority, and - // RuntimeConstraints fields are populated. + // The container to run. Only the UUID, State, Priority, + // RuntimeConstraints, Mounts, and ContainerImage fields are + // populated. Container arvados.Container `json:"container"` InstanceType arvados.InstanceType `json:"instance_type"` } @@ -381,7 +382,7 @@ func (cq *Queue) poll() (map[string]*arvados.Container, error) { *next[upd.UUID] = upd } } - selectParam := []string{"uuid", "state", "priority", "runtime_constraints"} + selectParam := []string{"uuid", "state", "priority", "runtime_constraints", "container_image", "mounts"} limitParam := 1000 mine, err := cq.fetchAll(arvados.ResourceListParams{ -- 2.30.2