[ARVADOS] updated: b6552a6b3c1202eafebfc630ee7e9d6c919b811e

[Git user]

Summary of changes:
 .../app/controllers/application_controller.rb      |  7 ++--
 .../app/views/projects/_show_dashboard.html.erb    | 43 +++++++++++++++++----
 .../app/views/work_units/_show_component.html.erb  | 18 ++++++++-
 apps/workbench/config/application.default.yml      |  6 +++
 apps/workbench/test/helpers/share_object_helper.rb |  8 ++--
 .../test/integration/application_layout_test.rb    |  5 ++-
 .../test/integration/pipeline_instances_test.rb    |  8 ++--
 apps/workbench/test/integration/users_test.rb      |  3 +-
 apps/workbench/test/integration/work_units_test.rb |  6 ++-
 apps/workbench/test/integration_helper.rb          | 18 ++++++---
 apps/workbench/test/unit/work_unit_test.rb         |  2 +-
 build/run-build-packages.sh                        |  2 +-
 sdk/cwl/arvados_cwl/__init__.py                    |  3 +-
 sdk/cwl/setup.py                                   |  2 +-
 services/api/app/models/container.rb               | 27 +++++++++++++
 services/api/app/models/container_request.rb       | 12 +++++-
 services/api/config/application.default.yml        |  7 ++++
 .../migrate/20160926194129_add_container_count.rb  |  9 +++++
 services/api/db/structure.sql                      |  7 +++-
 services/api/test/fixtures/container_requests.yml  | 20 ++++++++++
 services/api/test/unit/container_request_test.rb   | 44 ++++++++++++++++++++--
 21 files changed, 217 insertions(+), 40 deletions(-)
 create mode 100644 services/api/db/migrate/20160926194129_add_container_count.rb

       via  b6552a6b3c1202eafebfc630ee7e9d6c919b811e (commit)
       via  4d015af8133d6a50ff85dd6a9c3cfbe5c092e43f (commit)
       via  d68cb1845e82f44ecf126ae4fd1ba3abc00f4463 (commit)
       via  e9bf0a8dec771a53818ee76026c8bcc93a4722da (commit)
       via  23b1c79162bd422f99e4d7a0e491d82da560d91f (commit)
       via  304273fabb09ff72e94481a610e84f78776f05e3 (commit)
       via  f4c5d28ce98099b2f4204b5875449d76609c6a1c (commit)
       via  2f86d9ac26cad9cd202ccfe9cf07c31ecbabcf7e (commit)
       via  4c8559157a16bf3d2781714fdec0275fb7f53ac6 (commit)
       via  38f17f1e09e1eb2af273148744ca193d2541d37e (commit)
       via  a4ef9968a1b59b99efac934076b8216f3b2f499a (commit)
       via  47e42f1129363c2565e69c36ff26ce9c42731fb8 (commit)
       via  78995d3bf5b9e160de50318bc83744dda92e4211 (commit)
       via  a894a61cc9004e184bc63f9f0a785f555d6c6829 (commit)
       via  30d4c3f8f1d4d303c66fc568b11c34be7c51f2a8 (commit)
       via  a605fc29fd7f79b2882625c99a72e998157fa5bc (commit)
       via  8317b6e41e86f3e5c988906e0a9965479acf7e51 (commit)
       via  929e817fc1c91e1d9a0afcfcab93fe07304d9be5 (commit)
       via  068b2c9dbe1e467119680cbab61c62a03ad4fafd (commit)
       via  5905f1299f3a55519d1c79991e405ae8d47711f9 (commit)
       via  eabe4efe7b0964f537f2e09fb0d820272f1c86e7 (commit)
       via  986cdafd30a7bef4ccfbd18f808be52b2f6a458e (commit)
       via  bc67ce8d098c36e999739a9213b29bb72af6f23d (commit)
       via  1ce0bd54f40a686959e95e63f7aaa8b233269932 (commit)
       via  54cd184005d14ba93e93ae0eeb16ea70ee09a3b6 (commit)
       via  49987769d924c1bc77cbdc9e9b182c3e2cc09b2d (commit)
       via  3fb81a4db7abbaaa67b7a18d1c4a5ce82bc232dc (commit)
      from  cc18e9552f5ffb99910b0196e01ceb20d49da24c (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 b6552a6b3c1202eafebfc630ee7e9d6c919b811e
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 7 15:46:30 2016 -0400

    10144: Preloading all the collection using one single large query is much slower than making several requests
    with a smaller subset of  uuids/pdhs when displaying a pipeline instance with many jobs. Hence, make several
    requests for 200 collections at a time.

diff --git a/apps/workbench/app/views/work_units/_show_component.html.erb b/apps/workbench/app/views/work_units/_show_component.html.erb
index 2290a65..9bf751f 100644
--- a/apps/workbench/app/views/work_units/_show_component.html.erb
+++ b/apps/workbench/app/views/work_units/_show_component.html.erb
@@ -50,8 +50,22 @@
   collections.concat wu.children.collect {|j| j.log_collection}.uniq.compact
   collections_pdhs = collections.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
   collections_uuids = collections - collections_pdhs
-  preload_collections_for_objects collections_uuids if collections_uuids.any?
-  preload_for_pdhs collections_pdhs if collections_pdhs.any?
+
+  if collections_uuids.any?
+    start = 0; inc = 200
+    while start < collections_uuids.length
+      preload_collections_for_objects collections_uuids[start, inc]
+      start += inc
+    end
+  end
+
+  if collections_pdhs.any?
+    start = 0; inc = 200
+    while start < collections_pdhs.length
+      preload_for_pdhs collections_pdhs[start, inc]
+      start += inc
+    end
+  end
 
   repos = wu.children.collect {|c| c.repository}.uniq.compact
   preload_objects_for_dataclass(Repository, repos, :by_name) if repos.any?

commit 4d015af8133d6a50ff85dd6a9c3cfbe5c092e43f
Merge: cc18e95 d68cb18
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 7 14:37:16 2016 -0400

    Merge branch 'master' into 10144-pipeline-display-perf


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


hooks/post-receive
--