[ARVADOS] updated: 1ec252c8087c1f167d969e26c584ff346f4ac457

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/arv-run-pipeline-instance  | 2 +-
 services/api/script/crunch-dispatch.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  1ec252c8087c1f167d969e26c584ff346f4ac457 (commit)
      from  ae09643622ecea00bab110f20029f01c83e1cf30 (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 1ec252c8087c1f167d969e26c584ff346f4ac457
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jun 4 16:00:03 2014 -0400

    2955: Sets jobrecord.canceled_at when canceling/failing an orphan job.
    arv-run-pipeline-instance recognizes canceled jobs when counting the number of ended jobs.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index e9a7654..29052f8 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -578,7 +578,7 @@ class WhRunPipelineInstance
     failed = 0
     @components.each do |cname, c|
       if c[:job]
-        if c[:job][:finished_at] or (c[:job][:running] == false and c[:job][:success] == false)
+        if c[:job][:finished_at] or c[:job][:canceled_at] or (c[:job][:running] == false and c[:job][:success] == false)
           ended += 1
           if c[:job][:success] == true
             succeeded += 1
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index c09be81..9a8280f 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -51,6 +51,7 @@ class Dispatcher
           # job is marked running, but not known to crunch-dispatcher, and
           # hasn't produced any log entries for 5 minutes, so mark it as failed.
           jobrecord.running = false
+          jobrecord.canceled_at ||= Time.now
           jobrecord.finished_at ||= Time.now
           if jobrecord.success.nil?
             jobrecord.success = false

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


hooks/post-receive
--