[ARVADOS] updated: a76d71558daa6b623c00c8e262840fc6dd68119f

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  8c65288ad1bd034f5959c10c67d43f86878c6c49 (commit)
       via  a76d71558daa6b623c00c8e262840fc6dd68119f (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (8c65288ad1bd034f5959c10c67d43f86878c6c49)
            \
             N -- N -- N (a76d71558daa6b623c00c8e262840fc6dd68119f)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 a76d71558daa6b623c00c8e262840fc6dd68119f
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 13:10:03 2015 -0400

    6598: Fix misreported "running tasks" stat.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 13001e7..71cbd71 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -994,7 +994,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       update_progress_stats();
       select (undef, undef, undef, 0.1);
     }
-    elsif (time - $progress_stats_updated >= 30)
+    elsif (time - $progress_stats_updated >= 30 || $progress_is_dirty)
     {
       update_progress_stats();
     }
@@ -1101,8 +1101,8 @@ sub update_progress_stats
   $progress_stats_updated = time;
   return if !$progress_is_dirty;
   my ($todo, $done, $running) = (scalar @jobstep_todo,
-				 scalar @jobstep_done,
-				 scalar @slot - scalar @freeslot - scalar @holdslot);
+                                 scalar @jobstep_done,
+                                 scalar keys(%proc));
   $Job->{'tasks_summary'} ||= {};
   $Job->{'tasks_summary'}->{'todo'} = $todo;
   $Job->{'tasks_summary'}->{'done'} = $done;

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


hooks/post-receive
--