From 1c4bf0f3bbc09808f4937dafa6c3023604b73dce Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 23 Aug 2023 09:31:47 -0400 Subject: [PATCH] 20877: Fix missing 'and' Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- services/api/app/models/container.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb index e918650c9f..d2e76f74e3 100644 --- a/services/api/app/models/container.rb +++ b/services/api/app/models/container.rb @@ -746,7 +746,7 @@ class Container < ArvadosModel joins('left outer join containers as requesting_container on container_requests.requesting_container_uuid = requesting_container.uuid'). where("container_requests.container_uuid = ? and "+ "container_requests.priority > 0 and "+ - "container_requests.owner_uuid not in (select group_uuid from trashed_groups) "+ + "container_requests.owner_uuid not in (select group_uuid from trashed_groups) and "+ "(requesting_container.priority is null or (requesting_container.state = 'Running' and requesting_container.priority > 0)) and "+ "container_requests.state = 'Committed' and "+ "container_requests.container_count < container_requests.container_count_max", uuid). -- 2.30.2