X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4a5c16b70d01e063ae8fb82ee576a542b3a2376f..1b9bb00665f837cbafc87bb6fca2252e453abefc:/apps/workbench/app/views/pipeline_instances/_running_component.html.erb?ds=sidebyside diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb index 63075f7e66..7412a52614 100644 --- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb @@ -23,14 +23,8 @@
<% if current_job[:started_at] %> <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %> - <% cputime = tasks.map { |task| - if task.started_at and task.job_uuid == current_job[:uuid] - finished_at = task.finished_at || current_job[:finished_at] || Time.now() - finished_at - task.started_at - else - 0 - end - }.reduce(:+) || 0 %> + <% cputime = (current_job[:runtime_constraints].andand[:min_nodes] || 1) * + ((current_job[:finished_at] || Time.now()) - current_job[:started_at]) %> <%= render_runtime(walltime, false, false) %> <% if cputime > 0 %> / <%= render_runtime(cputime, false, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %> <% end %>