[ARVADOS] updated: d7e956d1ed2ffeb5b585896e6568481d474bb095

[Git user]

Summary of changes:
 apps/workbench/app/models/container_work_unit.rb   |  10 +-
 .../controllers/arvados/v1/groups_controller.rb    |   9 +-
 services/api/app/models/job.rb                     |   2 +-
 services/api/test/integration/groups_test.rb       |  13 ++
 services/keepstore/azure_blob_volume.go            |   5 +
 services/keepstore/handlers.go                     |  52 ++++-
 services/keepstore/mounts_test.go                  | 104 +++++++++
 services/keepstore/pull_worker.go                  |  87 ++++----
 services/keepstore/pull_worker_integration_test.go |  25 ++-
 services/keepstore/pull_worker_test.go             | 234 ++++++++++-----------
 services/keepstore/s3_volume.go                    |   5 +
 services/keepstore/trash_worker.go                 |  12 +-
 services/keepstore/trash_worker_test.go            |  29 ++-
 services/keepstore/volume.go                       |  65 ++++++
 services/keepstore/volume_test.go                  |   4 +
 services/keepstore/volume_unix.go                  |  77 +++++++
 services/keepstore/work_queue_test.go              |  22 +-
 17 files changed, 547 insertions(+), 208 deletions(-)
 create mode 100644 services/keepstore/mounts_test.go

       via  d7e956d1ed2ffeb5b585896e6568481d474bb095 (commit)
       via  38a5c3e23cdc1cd22963c356bb4ee5bf8141e8ad (commit)
       via  c182087b563ddbb40fde2b1d0c185af481df3bc2 (commit)
       via  8ac1775086e88da003b530210be1acb4c0f2c648 (commit)
       via  d121e087ad1b4e91f869dbd57534c6d6ce51d19d (commit)
       via  370036888e75b509ebf84ba8337273f7b9146f37 (commit)
       via  d77b362ffa44f0fd48cb7127ca34d6d676fad8ca (commit)
       via  df55660fc8748a317219043153f0bb54150086a8 (commit)
       via  84906c7124ab9707b5ccca94c83471fa551d9992 (commit)
       via  42f5f3a29761ac9a943530157da376c798a4ac6d (commit)
       via  9eff4af096f60b302abc9ad591f8b5fed45945a4 (commit)
       via  c4b5194c18567d470bb44c6eae29743ccaaa748d (commit)
       via  8cc51c761385bd6acc5dbaf7e95994e916ca0d0d (commit)
       via  74544f439360e3ece1d7609d76eb47bb4cf41faf (commit)
       via  38de76ceaabe6f1b522a538a27dfeb2f58c5fb69 (commit)
       via  50c67a3eee468bcced060d5c868d243dcaff5837 (commit)
       via  953a9210c382e96063aee4aae69147bcc344cc50 (commit)
       via  209dbf15bd9aa7ba6e01721caab7da7c1a9b0bbd (commit)
       via  61a8873440a505d1483a04354b8d1f2089e76e39 (commit)
       via  8690785168e12635ce35614c02d557fe77a3fe25 (commit)
      from  abdebdb124f9d75afc27df9c0748059ea041164d (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 d7e956d1ed2ffeb5b585896e6568481d474bb095
Author: radhika <radhika at curoverse.com>
Date:   Fri May 19 14:30:58 2017 -0400

    11710: fix typo in finding children

diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 68f8e30..ed34196 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -16,20 +16,16 @@ class ContainerWorkUnit < ProxyWorkUnit
   def children
     return @my_children if @my_children
 
-    container_uuid = nil
-    container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
-
     items = []
+    container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
     if container_uuid
-      my_children = @child_proxies
       cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts)
-      my_children = ContainerRequest.select(cols).where(requesting_container_uuid: container_uuid).results if !my_children
+      my_children = @child_proxies || ContainerRequest.select(cols).where(requesting_container_uuid: container_uuid).results if !my_children
       my_child_containers = my_children.map(&:container_uuid).compact.uniq
       grandchildren = {}
       my_child_containers.each { |c| grandchildren[c] = []} if my_child_containers.any?
-
       reqs = ContainerRequest.select(cols).where(requesting_container_uuid: my_child_containers).results if my_child_containers.any?
-      reqs.each {|cr| grandchildren[cr.request_container_uuid] << cr} if reqs
+      reqs.each {|cr| grandchildren[cr.requesting_container_uuid] << cr} if reqs
 
       my_children.each do |cr|
         items << cr.work_unit(cr.name || 'this container', child_objects=grandchildren[cr.container_uuid])

commit 38a5c3e23cdc1cd22963c356bb4ee5bf8141e8ad
Merge: abdebdb c182087
Author: radhika <radhika at curoverse.com>
Date:   Fri May 19 11:19:30 2017 -0400

    Merge branch 'master' into 11710-container-request-show-perf


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


hooks/post-receive
--