[ARVADOS] updated: a163b0c7b5afa782281f67f0fa0ca0e4b41c518f

git at public.curoverse.com git at public.curoverse.com
Thu Jun 5 14:45:36 EDT 2014


Summary of changes:
 sdk/cli/bin/arv-run-pipeline-instance                              | 2 +-
 services/api/script/{clean_orphan_jobs.rb => cancel_stale_jobs.rb} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename services/api/script/{clean_orphan_jobs.rb => cancel_stale_jobs.rb} (96%)

       via  a163b0c7b5afa782281f67f0fa0ca0e4b41c518f (commit)
      from  a46f0152c44fe20eba4db38858eaa2f99bae83f2 (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 a163b0c7b5afa782281f67f0fa0ca0e4b41c518f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 5 14:44:51 2014 -0400

    2955: Renamed script to "cancel_stale_jobs".  Fixed spelling canceled_at -> cancelled_at.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 29052f8..e9b3f00 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][:canceled_at] or (c[:job][:running] == false and c[:job][:success] == false)
+        if c[:job][:finished_at] or c[:job][:cancelled_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/clean_orphan_jobs.rb b/services/api/script/cancel_stale_jobs.rb
similarity index 96%
rename from services/api/script/clean_orphan_jobs.rb
rename to services/api/script/cancel_stale_jobs.rb
index 35673c3..dde4cbe 100755
--- a/services/api/script/clean_orphan_jobs.rb
+++ b/services/api/script/cancel_stale_jobs.rb
@@ -13,7 +13,7 @@ ENV["RAILS_ENV"] = ARGV[0] || ENV["RAILS_ENV"] || "development"
 require File.dirname(__FILE__) + '/../config/boot'
 require File.dirname(__FILE__) + '/../config/environment'
 
-def refresh_running
+def cancel_stale_jobs
   Job.running.each do |jobrecord|
     f = Log.where("object_uuid=?", jobrecord.uuid).limit(1).order("created_at desc").first
     if f
@@ -34,4 +34,4 @@ def refresh_running
   end
 end
 
-refresh_running
+cancel_stale_jobs

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list