[ARVADOS] updated: 701b7fa879d48ecc38d6261e151b7e54c66a80d6

[Git user]

Summary of changes:
 .../app/controllers/application_controller.rb      |   7 ++
 .../controllers/container_requests_controller.rb   |  55 +++++++++--
 apps/workbench/app/helpers/provenance_helper.rb    | 106 +++++++++++++--------
 apps/workbench/app/models/container_work_unit.rb   |   2 +-
 sdk/python/arvados/arvfile.py                      |   2 +-
 sdk/python/tests/test_collections.py               |  34 +++++++
 services/api/app/models/job.rb                     |  87 +++++++++++++----
 services/api/config/application.default.yml        |  21 ++++
 services/api/test/unit/job_test.rb                 |  18 +++-
 services/crunch-run/crunchrun.go                   |  94 ++++++++++++++++--
 services/crunch-run/crunchrun_test.go              |  83 +++++++++++++++-
 11 files changed, 424 insertions(+), 85 deletions(-)

       via  701b7fa879d48ecc38d6261e151b7e54c66a80d6 (commit)
       via  027f1112389923955746e3cc564c5fea81d26403 (commit)
       via  f26f70d0a60798065c5f7a5cb91b95587cc9e9ef (commit)
       via  aceb2d1ed239fa82fcb8bb352b632a8d92251dac (commit)
       via  f5fbc48810d1397df9e6244c16cf07c05162d36a (commit)
       via  b9b4502bcddeccd794614bf6979d643f9f350877 (commit)
       via  a340487a7d406e73e51479a765a3d08bdb92b8d0 (commit)
       via  94b92f075dbfb60a25fbe28e5741a553ac4985fd (commit)
       via  eee2c470dfa879c769eccb515861419a6b900101 (commit)
       via  795bf007cbe24775bd348fb40fc5c28d93c8f23d (commit)
       via  34f9129a3d7d2a625455fccbd01c94fc18f6685a (commit)
       via  1903e0e26b3677d9686e1d19cea897690945e3ed (commit)
       via  bbe86c4a80d53807b325b46dd51557a7a01670ae (commit)
       via  ed56c26720184ca3d07f452faf014e177f1a2c2f (commit)
       via  0d5962b720872b8f4cbd6bc0a3f44d896bff7daf (commit)
       via  2aaef36d5b642e8e2b0bcd9bdca0a25217e49590 (commit)
       via  8794708d1e16935173f6b20c551fdd661b60883d (commit)
       via  c70fbca19235ebff6ab560ced462496cea7d2f72 (commit)
       via  86c4a20bcf282407f92cb3f3e0a022de79107aca (commit)
       via  fb5d279228a7adcafd858d9e137accd8010bb382 (commit)
       via  b29ca38e4409fe0149aea28a0e26a84d56ccca17 (commit)
       via  b20770d7e5a4ba0a974a7b98fce87b81aead95d9 (commit)
       via  4259263d270a5e377009d20835a463551c708d82 (commit)
       via  e018237856b7bdd61e46468696bf3783a8f745df (commit)
       via  39755f7642bf974e6e2e1cf3828b5240f489566c (commit)
      from  ac958c1559429a7d8d9f7bd44422ebdc96c5be6d (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 701b7fa879d48ecc38d6261e151b7e54c66a80d6
Author: radhika <radhika at curoverse.com>
Date:   Tue May 16 15:33:31 2017 -0400

    11580: preload containers

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index a63fe6e..0a40f58 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -1234,8 +1234,15 @@ class ApplicationController < ActionController::Base
         @objects_for[obj.name] = obj
       end
     else
+      key_prefix = "request_#{Thread.current.object_id}_#{dataclass.to_s}_"
       dataclass.where(uuid: uuids).each do |obj|
         @objects_for[obj.uuid] = obj
+        if dataclass == Collection
+          # The collecions#index defaults to "all attributes except manifest_text"
+          # Hence, this object is not suitable for preloading the find() cache.
+        else
+          Rails.cache.write(key_prefix + obj.uuid, obj.as_json)
+        end
       end
     end
     @objects_for
diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 84fc1f8..afdc91e 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -6,7 +6,7 @@ class ContainerWorkUnit < ProxyWorkUnit
     if @proxied.is_a?(ContainerRequest)
       container_uuid = get(:container_uuid)
       if container_uuid
-        @container = Container.where(uuid: container_uuid).first
+        @container = Container.find(container_uuid)
       end
     end
   end

commit 027f1112389923955746e3cc564c5fea81d26403
Merge: ac958c1 f26f70d
Author: radhika <radhika at curoverse.com>
Date:   Tue May 16 12:37:18 2017 -0400

    Merge branch 'master' into 11580-container-requests


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


hooks/post-receive
--