[ARVADOS] created: 15945ebab4fc71980b2c6ddceb149a3d7365c29e

[git at public.curoverse.com]

        at  15945ebab4fc71980b2c6ddceb149a3d7365c29e (commit)


commit 15945ebab4fc71980b2c6ddceb149a3d7365c29e
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 8 13:19:27 2014 -0400

    2739: Ensure crunch-job spawns all new tasks.
    
    Without this fix, crunch-job would only spawn tasks up to the API
    server default result limit (currently 100).  Refs #2739.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 5d3bfdf..d7d6ae7 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -946,13 +946,19 @@ sub reapchildren
   delete $proc{$pid};
 
   # Load new tasks
-  my $newtask_list = $arv->{'job_tasks'}->{'list'}->execute(
-    'where' => {
-      'created_by_job_task_uuid' => $Jobstep->{'arvados_task'}->{uuid}
-    },
-    'order' => 'qsequence'
-  );
-  foreach my $arvados_task (@{$newtask_list->{'items'}}) {
+  my $newtask_list = [];
+  my $newtask_results;
+  do {
+    $newtask_results = $arv->{'job_tasks'}->{'list'}->execute(
+      'where' => {
+        'created_by_job_task_uuid' => $Jobstep->{'arvados_task'}->{uuid}
+      },
+      'order' => 'qsequence',
+      'offset' => scalar(@$newtask_list),
+    );
+    push(@$newtask_list, @{$newtask_results->{items}});
+  } while (@{$newtask_results->{items}});
+  foreach my $arvados_task (@$newtask_list) {
     my $jobstep = {
       'level' => $arvados_task->{'sequence'},
       'failures' => 0,

commit a9eaabb02fe7110f0e16bcd7f27d1a0cd5eab08b
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 8 13:15:16 2014 -0400

    Bugfix: Don't crash trying to render a new log buffer.
    
    If you submit a Job and then try to load your Workbench Dashboard,
    Workbench will likely crash because the log_buffer is a symbol at that
    time.  This check guards to make sure that we only try to render
    actual log content.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 10592f5..f62bd5d 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -58,7 +58,7 @@
           <a href="<%= collection_path(j.log) %>/<%= file[1] %>?disposition=inline&size=<%= file[2] %>">Log</a>
         <% end %>
       <% end %>
-    <% elsif j.respond_to? :log_buffer and j.log_buffer %>
+    <% elsif j.respond_to? :log_buffer and j.log_buffer.is_a? String %>
       <% buf = j.log_buffer.strip.split("\n").last %>
       <span title="<%= buf %>"><%= buf %></span>
     <% end %>

-----------------------------------------------------------------------


hooks/post-receive
--