[ARVADOS] updated: 2873926cdbfc8012b276db11d24cea3ad6a4bdd4

[git at public.curoverse.com]

Summary of changes:
 .../app/helpers/pipeline_instances_helper.rb       | 27 ++++++--
 apps/workbench/app/models/job.rb                   | 20 ------
 .../views/application/_job_status_label.html.erb   |  3 +-
 .../workbench/app/views/jobs/_show_recent.html.erb |  2 +-
 apps/workbench/app/views/jobs/show.html.erb        |  2 +-
 .../pipeline_instances/_running_component.html.erb |  6 +-
 .../app/views/projects/_show_dashboard.html.erb    |  8 +--
 apps/workbench/app/views/users/_tables.html.erb    |  2 +-
 docker/api/Dockerfile                              |  3 +-
 docker/api/application.yml.in                      |  2 +
 docker/base/Dockerfile                             |  2 +-
 docker/build_tools/build.rb                        |  1 +
 docker/config.yml.example                          |  5 ++
 docker/jobs/Dockerfile                             |  5 +-
 docker/passenger/Dockerfile                        |  6 +-
 sdk/cli/bin/arv-run-pipeline-instance              | 71 ++++++++-----------
 sdk/cli/bin/crunch-job                             | 38 ++++++----
 sdk/python/arvados/commands/keepdocker.py          |  2 +-
 .../app/controllers/arvados/v1/jobs_controller.rb  |  7 +-
 services/api/app/controllers/static_controller.rb  | 17 +++--
 services/api/app/mailers/admin_notifier.rb         | 12 ----
 services/api/app/mailers/user_notifier.rb          | 12 ----
 services/api/app/models/job.rb                     |  4 +-
 .../admin_notifier/new_inactive_user.text.erb      |  4 +-
 .../api/app/views/admin_notifier/new_user.text.erb |  4 +-
 .../views/user_notifier/account_is_setup.text.erb  |  4 +-
 services/api/config/application.default.yml        | 18 ++---
 services/api/config/application.yml.example        |  2 +
 services/api/script/crunch-dispatch.rb             | 81 ++++++++++++++--------
 services/api/test/fixtures/jobs.yml                | 11 +++
 30 files changed, 195 insertions(+), 186 deletions(-)

       via  2873926cdbfc8012b276db11d24cea3ad6a4bdd4 (commit)
       via  1b189a0961ba757caf6160285b59daa26c7cdcae (commit)
       via  d4724463bd248922dc37b43f59d54890d10581c1 (commit)
       via  eaf8fb3be8218971b9a66d10b7bbabbbf92cd041 (commit)
       via  c2c38069d28fc68dea6e1b2cb0d5f4f36e1ef03f (commit)
       via  d592a37f987ed90e017bc9d2d962a2f620e27095 (commit)
       via  22c3f131e929bef5574ef71a98bc48290c36dfb3 (commit)
       via  a3787ef83a0538097fb6f802f675be740a241ebc (commit)
       via  ce410ef35e137e040ace097a74a33f04c5975ad9 (commit)
       via  c491bfd795b7c7c4f26f18003290bd7ec9e88d60 (commit)
       via  abc1db31bae1b33ed899a1da4b59f2edc0f5f189 (commit)
       via  1d8f975be8d35444aca0f21a0b6c91bc4a277662 (commit)
       via  4e8745c2a744a2c3e6b44ee6100fb1a26749cebf (commit)
       via  a805395a2a64aa83a1604ade6932151a0846b577 (commit)
       via  48d04722a5e0478e22be33f58036806a55b3a0eb (commit)
       via  1d135e43d06148b100fbc8534144b405e4824af9 (commit)
       via  c2e491ff35fe12d895587a6e7cf0cc9f1f7bfcd9 (commit)
       via  2861857a87d4c40924f783862ee09e91cec0b96f (commit)
       via  94b11dfc98ed84d0f91f2bc2fc81e76b4d3c35d7 (commit)
       via  e9622f371ad4d75f0a0b5ee9480fae779dd63156 (commit)
       via  5253b7d81a54c6087b35148499c360c692fac870 (commit)
       via  a452ab111d29f4f06d31c3fe760bb17b211020a6 (commit)
       via  11b71c18e7506374953119d717f7c4e8c52f8bc4 (commit)
       via  4bb3091019c84f748a60492fb52dcc0bba0bbef0 (commit)
       via  9daebff7dfeaa7092da078f3a0bfdc0c9d8e51e0 (commit)
       via  9a15397a7e030704f63441d6e7893cb3d8be1d64 (commit)
       via  3d84dd62a85647e9b3dfc34af8303c09b9923498 (commit)
       via  93c7127afd21f82662e9b471e7c617ae8c59ad19 (commit)
       via  68dc1fcaec00d7d954be19f2c184e04626639616 (commit)
       via  4c53b3aee935b41e11c71ff1468a10d6a80c390c (commit)
       via  c8ad3a2a0f27964eff5d5c2d845afab728836473 (commit)
      from  8bc77d6ee612217cfb50bca997ce3b94c19637e9 (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 2873926cdbfc8012b276db11d24cea3ad6a4bdd4
Merge: 8bc77d6 1b189a0
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 26 11:02:06 2014 -0400

    Merge branch 'master' into 3859-api-job-lock-method
    
    Conflicts:
    	services/api/script/crunch-dispatch.rb

diff --cc services/api/script/crunch-dispatch.rb
index c152841,00144d3..e54105d
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@@ -419,18 -443,15 +443,17 @@@ class Dispatche
      end
  
      # Wait the thread (returns a Process::Status)
 -    exit_status = j_done[:wait_thr].value
 +    exit_status = j_done[:wait_thr].value.exitstatus
  
      jobrecord = Job.find_by_uuid(job_done.uuid)
-     if exit_status != 75 and jobrecord.started_at
-       # Clean up state fields in case crunch-job exited without
-       # putting the job in a suitable "finished" state.
-       jobrecord.running = false
-       jobrecord.finished_at ||= Time.now
-       if jobrecord.success.nil?
-         jobrecord.success = false
 -    if exit_status.to_i != 75 and jobrecord.state == "Running"
++    if exit_status != 75 and jobrecord.state == "Running"
+       # crunch-job did not return exit code 75 (see below) and left the job in
+       # the "Running" state, which means there was an unhandled error.  Fail
+       # the job.
+       jobrecord.state = "Failed"
 -      jobrecord.save!
++      if not jobrecord.save
++        $stderr.puts "dispatch: jobrecord.save failed"
 +      end
-       jobrecord.save!
      else
        # Don't fail the job if crunch-job didn't even get as far as
        # starting it. If the job failed to run due to an infrastructure

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


hooks/post-receive
--