[ARVADOS] updated: c86a3350fe212e35a7d745d5607fbc27bc1fd3c8
git at public.curoverse.com
git at public.curoverse.com
Mon Jul 27 14:32:08 EDT 2015
Summary of changes:
.../app/helpers/pipeline_instances_helper.rb | 13 ++++
.../pipeline_instances/_running_component.html.erb | 6 +-
.../_show_components_running.html.erb | 12 ++--
doc/sdk/cli/subcommands.html.textile.liquid | 2 +-
doc/user/topics/arv-run.html.textile.liquid | 2 +-
sdk/python/arvados/commands/run.py | 9 +--
sdk/python/arvados/events.py | 60 ++++++++++++------
sdk/python/bin/arv-get | 73 ++++++++++++----------
sdk/python/tests/test_websockets.py | 6 +-
services/api/lib/eventbus.rb | 4 +-
services/fuse/arvados_fuse/__init__.py | 23 +++++--
11 files changed, 136 insertions(+), 74 deletions(-)
via c86a3350fe212e35a7d745d5607fbc27bc1fd3c8 (commit)
via aa924bec2e4b5c029cb19f4e9021d72b665be76b (commit)
via e69333d856baabf8bbbc27602850dcfe86309d23 (commit)
via 66af20886def83f6a20cc1e6587de00cbf2f8b59 (commit)
via 4a5adfa084b3c3a8e586df5ac0acc0b3fc6150db (commit)
via a71c0bc8685f71dc9ebb2804626d2d12741eebc3 (commit)
via 753c1446ea70d70043be0913e52bb270d28ecded (commit)
via 3e6ba5fa5f225c8aa431ce9a2796369c1e1dda2d (commit)
via aeb481ad2a9b9c3c090b15b317d6ce262ca95da9 (commit)
via 9ce68afa9f3f1b558acd19561760c19e35b8a356 (commit)
via 2ab08e38376d9591394d35d7676badf96f7b99c9 (commit)
via 17ce65cd493d8040640f5a5c3d2a97a5175a0465 (commit)
via 51641ba5579cb9ebe14234e0888a162b46d1627d (commit)
via 0ae899078093ac04cfdf416940f4faa821400641 (commit)
via a467cb24c0a2db71c39ce1bf86507bff6f3cea05 (commit)
via ce128902e008420f453eb29986280d72777bec32 (commit)
via 997b13a64e1e224f77c4f1f39f0033d4750413de (commit)
via 5e33262f1aad92582215e29b875411d514846269 (commit)
via 119d87107846d77274fdaa52dc8cdadd2a7b9765 (commit)
from 1b9bb00665f837cbafc87bb6fca2252e453abefc (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 c86a3350fe212e35a7d745d5607fbc27bc1fd3c8
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 27 14:31:02 2015 -0400
6602: display runtime using the formula (min_nodes * (finished_at - started_at))
diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index ba05f9e..939ddcb 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -306,6 +306,19 @@ module PipelineInstancesHelper
raw(s)
end
+ def render_runtime_compact duration
+ if duration >= DAY
+ "#{(duration / DAY.to_f).round(2)} days"
+ elsif duration >= HOUR
+ "#{(duration / HOUR.to_f).round(2)} hours"
+ elsif duration >= MINUTE
+ "#{(duration / MINUTE.to_f).round(2)} minutes"
+ else
+ seconds = duration.round(2)
+ "#{seconds} second#{'s' if seconds != 1}"
+ end
+ end
+
def render_unreadable_inputs_present
if current_user and controller.class.name.eql?('PipelineInstancesController') and unreadable_inputs_present?
raw('<div class="alert alert-danger unreadable-inputs-present">' +
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 7412a52..4b14356 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -25,8 +25,8 @@
<% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
<% 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 %>
+ <%= render_runtime_compact(walltime) %>
+ <% if cputime > 0 %> / <%= render_runtime_compact(cputime) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %>
<% end %>
</div>
<% end %>
@@ -35,7 +35,7 @@
<%# column offset 5 %>
<div class="col-md-6">
<% queuetime = Time.now - Time.parse(current_job[:created_at].to_s) %>
- Queued for <%= render_runtime(queuetime, true) %>.
+ Queued for <%= render_runtime_compact(queuetime) %>.
<% begin %>
<% if current_job[:queue_position] == 0 %>
This job is next in the queue to run.
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index c4b0f4a..5213c2a 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -41,9 +41,9 @@
end %>
<%= if walltime > runningtime
- render_runtime(walltime, true, false)
+ render_runtime_compact(walltime)
else
- render_runtime(runningtime, true, false)
+ render_runtime_compact(runningtime)
end %><% if @object.finished_at %> at <%= render_localized_date(@object.finished_at) %><% end %>.
<% else %>
This pipeline is <%= if @object.state.start_with? 'Running' then 'active' else @object.state.downcase end %>.
@@ -71,11 +71,11 @@
0
end
}.reduce(:+) || 0 %>
- <%= render_runtime(runningtime, true, false) %><% if (walltime - runningtime) > 0 %>
- (<%= render_runtime(walltime - runningtime, true, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
+ <%= render_runtime_compact(runningtime) %><% if (walltime - runningtime) > 0 %>
+ (<%= render_runtime_compact(walltime - runningtime) %> queued)<% end %><% if cputime == 0 %>.<% else %>
and used
- <%= render_runtime(cputime, true, false) %>
- of total time on the nodes (<%= (cputime/runningtime).round(1) %>⨯ scaling).
+ <%= render_runtime_compact(cputime) %>
+ of node allocation time (<%= (cputime/runningtime).round(1) %>⨯ scaling).
<% end %>
</p>
commit aa924bec2e4b5c029cb19f4e9021d72b665be76b
Merge: 9ce68af e69333d
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 27 12:59:50 2015 -0400
Merge branch 'master' into 6602-job-runtime-display
commit 9ce68afa9f3f1b558acd19561760c19e35b8a356
Merge: 1b9bb00 2ab08e3
Author: radhika <radhika at curoverse.com>
Date: Fri Jul 24 15:17:23 2015 -0400
Merge branch 'master' into 6602-job-runtime-display
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list