[ARVADOS] updated: 1.2.0-10-g4a466ccc5
Git user
git at public.curoverse.com
Thu Sep 6 10:54:29 EDT 2018
Summary of changes:
apps/workbench/app/models/container_work_unit.rb | 4 ++++
.../workbench/app/views/projects/_show_dashboard.html.erb | 15 +++++++++++++--
.../app/views/work_units/_show_component.html.erb | 12 ++++++++++++
services/api/test/unit/container_test.rb | 2 +-
4 files changed, 30 insertions(+), 3 deletions(-)
via 4a466ccc5f447e7284c2d479ea3ee427876896e0 (commit)
from cb2a05a424c0fc4bb05d7ad171cd220a0507150e (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 4a466ccc5f447e7284c2d479ea3ee427876896e0
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Thu Sep 6 11:51:40 2018 -0300
13773: Show 'Warning' label on jobs that have this runtime status and aren't failing.
* Show warning information panel on job detailed view
* Show tooltip with error/warning information on dashboard
* Fix test
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 94b416173..964295619 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -120,6 +120,8 @@ class ContainerWorkUnit < ProxyWorkUnit
when 'Running'
if runtime_status[:error]
'Failing'
+ elsif runtime_status[:warning]
+ 'Warning'
else
state
end
@@ -137,6 +139,8 @@ class ContainerWorkUnit < ProxyWorkUnit
case state_label
when 'Failing'
'danger'
+ when 'Warning'
+ 'warning'
else
super
end
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index e51cf5314..cc00e0a8e 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -88,8 +88,19 @@ SPDX-License-Identifier: AGPL-3.0 %>
No recent pipelines or processes.
<% else %>
<% wus.each do |p, wu| %>
+ <%
+ # Set up tooltip containing useful runtime information
+ runtime_status_tooltip = nil
+ if wu.runtime_status
+ if wu.runtime_status[:error]
+ runtime_status_tooltip = "Error: #{wu.runtime_status[:error]}"
+ elsif wu.runtime_status[:warning]
+ runtime_status_tooltip = "Warning: #{wu.runtime_status[:warning]}"
+ end
+ end
+ %>
<% if wu.is_finished? %>
- <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
+ <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=runtime_status_tooltip%>">
<div class="row">
<div class="col-md-6 text-overflow-ellipsis">
<%= link_to_if_arvados_object p, {friendly_name: true} %>
@@ -114,7 +125,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
</div>
<% else %>
- <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
+ <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=runtime_status_tooltip%>">
<div class="row">
<div class="col-md-6 text-overflow-ellipsis">
<%= link_to_if_arvados_object p, {friendly_name: true} %>
diff --git a/apps/workbench/app/views/work_units/_show_component.html.erb b/apps/workbench/app/views/work_units/_show_component.html.erb
index d85329576..b635b0044 100644
--- a/apps/workbench/app/views/work_units/_show_component.html.erb
+++ b/apps/workbench/app/views/work_units/_show_component.html.erb
@@ -57,6 +57,18 @@ SPDX-License-Identifier: AGPL-3.0 %>
</div>
</div>
</div>
+<%# Display runtime warning message %>
+<% elsif wu.runtime_status.andand[:warning] %>
+<div class="container">
+ <div class="col-md-12">
+ <div class="panel panel-warning">
+ <div class="panel-heading">Warning</div>
+ <div class="panel-body">
+ <%= wu.runtime_status[:warning] %>
+ </div>
+ </div>
+ </div>
+</div>
<% end %>
<p>
diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb
index 3d8bf841e..c0bf4059d 100644
--- a/services/api/test/unit/container_test.rb
+++ b/services/api/test/unit/container_test.rb
@@ -135,7 +135,7 @@ class ContainerTest < ActiveSupport::TestCase
set_user_from_auth :active
attrs = {
environment: {},
- mounts: {"BAR" => "FOO"},
+ mounts: {"BAR" => {"kind" => "FOO"}},
output_path: "/tmp",
priority: 1,
runtime_constraints: {"vcpus" => 1, "ram" => 1}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list