[ARVADOS] updated: f300b641735aa2657cfdcc4303050095c3bd60d5
Git user
git at public.curoverse.com
Fri Sep 30 22:54:40 EDT 2016
Summary of changes:
apps/workbench/Gemfile.lock | 3 +
.../app/views/projects/_show_dashboard.html.erb | 39 +++++++++--
apps/workbench/config/application.default.yml | 4 ++
build/run-build-packages.sh | 8 +--
sdk/cwl/arvados_cwl/__init__.py | 17 ++++-
sdk/cwl/arvados_cwl/arvjob.py | 58 +++++++++--------
sdk/cwl/arvados_cwl/arvworkflow.py | 75 +++++++++++-----------
sdk/cwl/arvados_cwl/perf.py | 2 +-
sdk/cwl/setup.py | 2 +-
sdk/cwl/tests/test_job.py | 2 +-
10 files changed, 133 insertions(+), 77 deletions(-)
via f300b641735aa2657cfdcc4303050095c3bd60d5 (commit)
via a229ee1c2da50d247c5e7de12096f0f9d6ea3943 (commit)
via 27b732adbd4d2331436a433394658a0cfcf5fd94 (commit)
via fd3e91e6cd737554b4ae491a558e52f41bad3d07 (commit)
via d66f01bcf5a50e10879219c1b5e498f04a6d70f4 (commit)
via c8bb5cc118575835aa38122c7035989eeebe759f (commit)
via 95f399d4fca0c4e36c6da4e98e4092106ebfdc6d (commit)
via 9ea95168dc095e9547d0ae235e3986e428bf50c2 (commit)
from 4da754586b4529a4480951218a69ec6f41fee98d (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 f300b641735aa2657cfdcc4303050095c3bd60d5
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 30 22:54:09 2016 -0400
10078: preload collections and links during dashboard display
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 806ed8a..c1e3b6e 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -1,3 +1,29 @@
+<%
+ recent_procs = recent_processes(10)
+
+ wus = {}
+ outputs = []
+ recent_procs.each do |p|
+ wu = p.work_unit
+ wus[p] = wu
+ outputs << wu.outputs
+ end
+ outputs = outputs.flatten.uniq
+
+ collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
+ collection_uuids = outputs - collection_pdhs
+
+ if !Rails.configuration.suppress_collections_in_dashboard
+ recent_cs = recent_collections(8)
+ collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid}
+ collection_uuids.flatten.uniq
+ end
+
+ preload_collections_for_objects collection_uuids if collection_uuids.any?
+ preload_for_pdhs collection_pdhs if collection_pdhs.any?
+ preload_links_for_objects(collection_pdhs + collection_uuids)
+%>
+
<div class="row">
<div class="col-md-6">
<div class="panel panel-default" style="min-height: 10.5em">
@@ -26,13 +52,11 @@
<% end %>
</div>
- <% _recent_processes = recent_processes(12) %>
<div class="panel-body recent-processes">
- <% if _recent_processes.empty? %>
+ <% if recent_procs.empty? %>
No recent pipelines or processes.
<% else %>
- <% _recent_processes.each do |p| %>
- <% wu = p.work_unit %>
+ <% wus.each do |p, wu| %>
<% if wu.is_finished? %>
<div class="dashboard-panel-info-row row-<%=wu.uuid%>">
<div class="row">
@@ -139,6 +163,7 @@
</div>
</div>
</div>
+ <% if !Rails.configuration.suppress_collections_in_dashboard %>
<div class="panel panel-default">
<div class="panel-heading"><span class="panel-title">Recent collections</span>
<span class="pull-right">
@@ -148,11 +173,10 @@
</span>
</div>
<div class="panel-body">
- <% r = recent_collections(8) %>
- <% r[:collections].each do |p| %>
+ <% recent_cs[:collections].each do |p| %>
<div class="dashboard-panel-info-row">
<div>
- <i class="fa fa-fw fa-folder-o"></i><%= link_to_if_arvados_object r[:owners][p[:owner_uuid]], friendly_name: true %>/
+ <i class="fa fa-fw fa-folder-o"></i><%= link_to_if_arvados_object recent_cs[:owners][p[:owner_uuid]], friendly_name: true %>/
<span class="pull-right"><%= render_localized_date(p[:modified_at], "noseconds") %></span>
</div>
<div class="text-overflow-ellipsis" style="margin-left: 1em; width: 100%"><%= link_to_if_arvados_object p, {friendly_name: true, no_tags: true} %>
@@ -161,5 +185,6 @@
<% end %>
</div>
</div>
+ <% end %>
</div>
</div>
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 74d317b..5e5f4e9 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -280,3 +280,7 @@ common:
# Maximum number of historic log records of a running job to fetch
# and display in the Log tab, while subscribing to web sockets.
running_job_log_records_to_fetch: 2000
+
+ # In systems with many shared projects, dashboard loading can be slow
+ # due to collections indexing; hide the recent collections panel
+ suppress_collections_in_dashboard: false
commit a229ee1c2da50d247c5e7de12096f0f9d6ea3943
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 30 13:16:31 2016 -0400
10078: Restore master version
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 9d04708..a8431a7 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -318,3 +318,6 @@ DEPENDENCIES
therubyracer
uglifier (>= 1.0.3)
wiselinks
+
+BUNDLED WITH
+ 1.12.1
commit 27b732adbd4d2331436a433394658a0cfcf5fd94
Merge: 4da7545 fd3e91e
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 30 13:12:07 2016 -0400
Merge branch 'master' into 10078-dashboard-perf
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list