X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0f361d9a0748e2b470ed5bc73351cb2eaf3e02e3..9359659d79a0c17265ff8a09e896920243a1b800:/apps/workbench/app/models/container_work_unit.rb diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb index ed82f18036..dbc81c52a3 100644 --- a/apps/workbench/app/models/container_work_unit.rb +++ b/apps/workbench/app/models/container_work_unit.rb @@ -1,30 +1,42 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class ContainerWorkUnit < ProxyWorkUnit attr_accessor :container + attr_accessor :child_proxies - def initialize proxied, label, parent - super + def initialize proxied, label, parent, child_objects=nil + super proxied, label, parent if @proxied.is_a?(ContainerRequest) container_uuid = get(:container_uuid) if container_uuid - @container = Container.where(uuid: container_uuid).first + @container = Container.find(container_uuid) end end + @child_proxies = child_objects end def children return @my_children if @my_children - container_uuid = nil - container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end - items = [] + container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end if container_uuid - reqs = ContainerRequest.where(requesting_container_uuid: container_uuid).results - reqs.each do |cr| - items << cr.work_unit(cr.name || 'this container') + cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts) + my_children = @child_proxies || ContainerRequest.select(cols).where(requesting_container_uuid: container_uuid).results if !my_children + my_child_containers = my_children.map(&:container_uuid).compact.uniq + grandchildren = {} + my_child_containers.each { |c| grandchildren[c] = []} if my_child_containers.any? + reqs = ContainerRequest.select(cols).where(requesting_container_uuid: my_child_containers).results if my_child_containers.any? + reqs.each {|cr| grandchildren[cr.requesting_container_uuid] << cr} if reqs + + my_children.each do |cr| + items << cr.work_unit(cr.name || 'this container', child_objects=grandchildren[cr.container_uuid]) end end + @child_proxies = nil #no need of this any longer @my_children = items end @@ -46,13 +58,20 @@ class ContainerWorkUnit < ProxyWorkUnit end def can_cancel? - @proxied.is_a?(ContainerRequest) && @proxied.state == "Committed" && @proxied.priority > 0 && @proxied.editable? + @proxied.is_a?(ContainerRequest) && + @proxied.state == "Committed" && + (@proxied.priority > 0 || get(:state, @container) != 'Running') && + @proxied.editable? end def container_uuid get(:container_uuid) end + def requesting_container_uuid + get(:requesting_container_uuid) + end + def priority @proxied.priority end @@ -79,11 +98,29 @@ class ContainerWorkUnit < ProxyWorkUnit end def state_label - ec = exit_code - return "Failed" if (ec && ec != 0) - state = get_combined(:state) - return "Ready" if ((priority == 0) and (["Queued", "Locked"].include?(state))) - state + if get(:state) == 'Final' && get(:state, @container) != 'Complete' + # Request was finalized before its container started (or the + # container was cancelled) + return 'Cancelled' + end + state = get(:state, @container) || get(:state, @proxied) + case state + when 'Locked', 'Queued' + if priority == 0 + 'On hold' + else + 'Queued' + end + when 'Complete' + if exit_code == 0 + state + else + 'Failed' + end + else + # Cancelled, Running, or Uncommitted (no container assigned) + state + end end def exit_code @@ -163,6 +200,13 @@ class ContainerWorkUnit < ProxyWorkUnit protected def get_combined key - get(key, @container) || get(key, @proxied) + from_container = get(key, @container) + from_proxied = get(key, @proxied) + + if from_container.is_a? Hash or from_container.is_a? Array + if from_container.any? then from_container else from_proxied end + else + from_container || from_proxied + end end end