[ARVADOS] updated: 1.3.0-1389-g83ee4d3eb

Git user git at public.curoverse.com
Mon Jul 22 17:07:37 UTC 2019


Summary of changes:
 .../app/controllers/collections_controller.rb      |   4 +-
 .../controllers/container_requests_controller.rb   |  31 ++--
 apps/workbench/app/controllers/jobs_controller.rb  |   1 -
 .../controllers/pipeline_instances_controller.rb   |   1 -
 apps/workbench/app/helpers/provenance_helper.rb    | 136 ++++++++++------
 build/package-build-dockerfiles/Makefile           |  10 +-
 build/package-build-dockerfiles/debian8/Dockerfile |  43 -----
 .../ubuntu1404/Dockerfile                          |  42 -----
 build/package-test-dockerfiles/Makefile            |  10 +-
 build/package-test-dockerfiles/debian8/Dockerfile  |  28 ----
 .../package-test-dockerfiles/ubuntu1404/Dockerfile |  26 ---
 build/run-build-packages-one-target.sh             |   7 +-
 build/run-build-packages.sh                        |   4 +-
 build/run-library.sh                               |   2 -
 build/run-tests.sh                                 |  42 +++--
 cmd/arvados-client/cmd.go                          |   9 +-
 cmd/arvados-server/cmd.go                          |   7 +-
 doc/_config.yml                                    |  10 +-
 doc/_includes/_what_is_cwl.liquid                  |   2 +-
 doc/admin/config-migration.html.textile.liquid     |   8 +-
 doc/admin/troubleshooting.html.textile.liquid      |  74 +++++++++
 doc/api/methods/collections.html.textile.liquid    |  33 ++++
 doc/api/methods/groups.html.textile.liquid         |  28 ++--
 doc/install/install-api-server.html.textile.liquid |   4 +
 ...nstall-manual-prerequisites.html.textile.liquid |  10 +-
 .../install-nodemanager.html.textile.liquid        |   2 +-
 doc/user/composer/composer.html.textile.liquid     |   2 +-
 doc/user/cwl/cwl-extensions.html.textile.liquid    |  93 ++++++-----
 doc/user/cwl/cwl-style.html.textile.liquid         | 161 +++++++++---------
 doc/user/cwl/cwl-versions.html.textile.liquid      |  34 ++++
 doc/user/topics/arv-docker.html.textile.liquid     |  78 ++-------
 .../writing-cwl-workflow.html.textile.liquid       |   8 +-
 lib/cloud/cloudtest/cmd.go                         |   4 +-
 lib/cmd/cmd.go                                     |  13 +-
 lib/config/cmd.go                                  |  75 ++++-----
 lib/config/cmd_test.go                             |  46 +++++-
 lib/config/config.default.yml                      |  26 ++-
 lib/config/deprecated.go                           |  51 +++++-
 lib/config/export_test.go                          |   5 +-
 lib/config/generated_config.go                     |  26 ++-
 lib/config/load.go                                 | 158 ++++++++++++++----
 lib/config/load_test.go                            | 179 ++++++++++++++++++---
 lib/controller/federation/list.go                  |  24 +--
 lib/controller/federation_test.go                  |   6 +-
 lib/dispatchcloud/container/queue_test.go          |   2 +-
 lib/service/cmd.go                                 |  16 +-
 sdk/go/arvados/config.go                           |  27 +++-
 sdk/python/tests/run_test_server.py                |  49 +++---
 .../api/app/controllers/application_controller.rb  |  12 +-
 .../arvados/v1/collections_controller.rb           | 112 ++++++++++---
 .../controllers/arvados/v1/groups_controller.rb    |   3 +
 services/api/config/initializers/lograge.rb        |  15 ++
 .../test/functional/application_controller_test.rb |  19 ++-
 .../arvados/v1/schema_controller_test.rb           |   2 +-
 .../api/test/integration/login_workflow_test.rb    |   8 +-
 services/fuse/arvados_fuse/__init__.py             |  49 +++---
 services/fuse/arvados_fuse/command.py              |  11 +-
 services/fuse/arvados_fuse/crunchstat.py           |  12 +-
 services/fuse/arvados_fuse/fresh.py                |   1 +
 services/fuse/arvados_fuse/fusedir.py              |  21 ++-
 services/fuse/arvados_fuse/fusefile.py             |   6 +-
 services/fuse/setup.py                             |   8 +-
 services/fuse/tests/fstest.py                      |  64 ++++----
 services/fuse/tests/integration_test.py            |   3 +-
 services/fuse/tests/mount_test_base.py             |   5 +-
 .../performance/test_collection_performance.py     |   8 +-
 services/fuse/tests/prof.py                        |   6 +-
 services/fuse/tests/test_cache.py                  |   1 +
 services/fuse/tests/test_command_args.py           |  45 ++++--
 services/fuse/tests/test_crunchstat.py             |   5 +-
 services/fuse/tests/test_exec.py                   |  12 +-
 services/fuse/tests/test_mount.py                  |  78 ++++-----
 services/fuse/tests/test_mount_type.py             |   2 +-
 services/fuse/tests/test_retry.py                  |   9 +-
 services/fuse/tests/test_tmp_collection.py         |  14 +-
 services/fuse/tests/test_token_expiry.py           |   7 +-
 services/fuse/tests/test_unmount.py                |   9 +-
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |   8 +-
 tools/arvbox/lib/arvbox/docker/api-setup.sh        |   1 +
 .../{service/controller/run => cluster-config.sh}  |  15 +-
 tools/arvbox/lib/arvbox/docker/common.sh           |   5 +
 tools/arvbox/lib/arvbox/docker/createusers.sh      |   2 +
 .../lib/arvbox/docker/service/certificate/run      |  29 ++--
 .../lib/arvbox/docker/service/controller/run       |  82 +---------
 tools/arvbox/lib/arvbox/docker/service/nginx/run   |  18 ++-
 .../lib/arvbox/docker/service/sso/run-service      |   2 +-
 .../arvbox/lib/arvbox/docker/service/workbench/run |   1 +
 87 files changed, 1449 insertions(+), 918 deletions(-)
 delete mode 100644 build/package-build-dockerfiles/debian8/Dockerfile
 delete mode 100644 build/package-build-dockerfiles/ubuntu1404/Dockerfile
 delete mode 100644 build/package-test-dockerfiles/debian8/Dockerfile
 delete mode 100644 build/package-test-dockerfiles/ubuntu1404/Dockerfile
 create mode 100644 doc/admin/troubleshooting.html.textile.liquid
 create mode 100644 doc/user/cwl/cwl-versions.html.textile.liquid
 copy tools/arvbox/lib/arvbox/docker/{service/controller/run => cluster-config.sh} (92%)

       via  83ee4d3ebf739f8aad67cf8faea093fc71d24d01 (commit)
       via  bd857c2152f66bc17745edcc5a7a88377024ff43 (commit)
       via  57c70faf4f31c619984b17331b636f941c84ea05 (commit)
       via  91cd750b78b39195b0e8f3328a3e7f34484172a3 (commit)
       via  c1cf71ba704247fd635ce49fde9f0bc8106512d8 (commit)
       via  3ce47c5d012f9dbd6335ad0ae092eb9cc8a3022e (commit)
       via  31cfadefdd43f2ddf8f31b43e7ea85ebe30f2935 (commit)
       via  67e4024755b7871b7f6dcc30ff094bb3291e1631 (commit)
       via  a1a1a8756149d5d05526503fd1e85115ea083fac (commit)
       via  2683a4c4f3ba13a6e0d2c9ee286b89588ff0359c (commit)
       via  de3633d7652a8b9fb372345e437dcaa226b8b896 (commit)
       via  ad76d059c306a73af45b6b7525aabb5f54c73f8b (commit)
       via  fe93327232956722ca9a5d91ddc3338eaff55f14 (commit)
       via  05c87aaf4572a6420a61e16495420e99ece2cef6 (commit)
       via  132b2be6b34663f7f8cc0be2a6eb8205edf0b2ee (commit)
       via  2bbb460a29d6f76bc50aacdba466aa6262ed93a3 (commit)
       via  b23721a01f61c6d9862ea6cb4d15bd620e06eeef (commit)
       via  16d9c611d5026e50692e1b3d0fefb951de5afa7b (commit)
       via  1c6f2ee788adb9e0924b6dddcb6c5c6a9bf10f43 (commit)
       via  ef661ebdb4cb7ae6e0bc79da5e27fe226ca70bfa (commit)
       via  508f13840841afc5938f7210a999ff58f002b29d (commit)
       via  82bcd68d8888b7558584f8b298b6e9611cdb73f8 (commit)
       via  7653054635e3f4f84da3f2b6862cd2c02fbe3fd4 (commit)
       via  e4e38ac6a304e7f81c27975a8b26acf774bceace (commit)
       via  9472e806ed70258e200b5a2ff892ef3ef791d947 (commit)
       via  54bc567a6667783decce679e2ea77b93d5f68322 (commit)
       via  b6546202f3830243ece6bfe13b83f09da3eb8c0e (commit)
       via  7f986aa9c765fa348926cd81b538f75a8ffad7e8 (commit)
       via  99240b3ebe6affa2087b7c320970bdb46c4594fd (commit)
       via  0779cb4c6b2768b42748077f212b472dfc24b055 (commit)
       via  f0549691efc1536602b641f5c662cd32ce0c58aa (commit)
       via  f87210bb3a0a48db83d94bf424c6e5c8ba9060d3 (commit)
       via  761e046b48ee242b6afabe3ce5cfba96d9e836c5 (commit)
       via  4fd53a5f75ac8359cd2611f35ec582b5899f2cb8 (commit)
       via  fac2b536bf3bc340f03ba6aedf1e3c8d6a463dfd (commit)
       via  783b9cc83e5b1530382d6696012e5c904f655aaa (commit)
       via  cc3eccee85114bacf0721eb7477fd7ae68295c89 (commit)
       via  25d42fc3206cd6073d4a9d8358469628643fe1da (commit)
       via  1dd7a37a31234899a0a87e8287260538a99c62a8 (commit)
       via  55be82a4d18a607e34e8843b561e2671f809780d (commit)
       via  7f2569f2e9900348dc76b495c9a416fe339593ae (commit)
       via  bd54b908943ce02edf1400fe8879f2383ad1c054 (commit)
       via  e723b02bc8e5382575f27b0ce803f775adf6d479 (commit)
       via  18056e7f71e5df94e98c6ccdcb0ea15cfd20f1ec (commit)
       via  7cac2b42ab530880a9ac6bff59909f960ea106e8 (commit)
       via  f74bfc124cf23d6f8712e0d62448d066022f022d (commit)
       via  8aaefe016ee75d3878946190bb476f9bcccc32bc (commit)
       via  86086ac2b5830dc20d021ba9fbea12035267920f (commit)
       via  e843017b451f1270c58539512e227c4da5656e25 (commit)
       via  b071451144bb00134cb31c868aae640fee4eca24 (commit)
       via  5fb914334a7c9ab9af62cb754629d736f6f157d3 (commit)
       via  60e2d19a092f4b15d4d2484405c46cbd84914616 (commit)
       via  055512c1f803e70cb9c426a8683aa9e8ddc8170c (commit)
       via  3310da050bd763055a67b2395f122ab5c01cbdf9 (commit)
       via  2ddb3a386c8ef91ef2bb041c5ef0bc385debd737 (commit)
       via  cfb6b08b94d423a768862481b629cfb21fcc70a2 (commit)
       via  e44092b29d6fbf3798c7f2b37164abd8f6f4e088 (commit)
       via  df4b4294ee91d521556724001be81261d99654d1 (commit)
       via  05eca3060c7200e47dd83cdcf8f4f7bcad14f62f (commit)
       via  f73fdac62e1b4a46858a67b57286765a652b565d (commit)
       via  056d1819f3d98d8526ca59d7118ff9ce2d48aa0d (commit)
       via  3a81f54c8c0da6babdfb9014a64079b6b41f73c7 (commit)
       via  41c60ea2ace3e68d32eba7e89f48faf1c7d0c823 (commit)
       via  b36138dd447b5ff557cfbb0e00c28899a9c3af17 (commit)
       via  93cfe7c262708fb09eda5aad1839c832816d4591 (commit)
       via  aa6dd2b23c738ebe01cdbaed86ef24ce343b29ae (commit)
       via  2c4bc5af8de7fe7a021088c040e4c6cea223bcd1 (commit)
       via  0c894574ca46b77209127a4908844c2e0e734cea (commit)
       via  3d98f9b1196260dbc7b9963dfd295d7e330e23d6 (commit)
       via  526f907804037b1f17b583df03a6117b361c18ec (commit)
       via  54d059bfc6d84dbc20613ddd17d812d571e93eda (commit)
       via  c45edd611595cf03848cf14943d0d44bb297c786 (commit)
       via  322b628a69e03d96dbf37fa33a402078af210b84 (commit)
       via  1465471dacdc30047c02376cd9800efd07d17974 (commit)
       via  88db3aa0503453f4894f80fcbcaca3ab64aa4abb (commit)
       via  ae3c4f3be309076773673248e5381fb5828fd663 (commit)
       via  a00c5d23c9f132e9ed1460d19a29a003322a067a (commit)
       via  5e67af9b14890c29bcc62cf1642fb3bc060fe271 (commit)
       via  d77c5b5925be6182430da592dedeeaaf05558554 (commit)
       via  31d8469fa1adfa0c3a07a23725f26b26f2291df5 (commit)
       via  ddd6e1758457a0206ba715f2c7f3dcd11de56955 (commit)
       via  d9af7924adf05f076f4e422e86ff8c512a2747a3 (commit)
       via  9b994adeeb7fddeea0c9ccba9ba81fabb7ed3d6e (commit)
       via  877ef23092e4e35334bfed79ae8e3171295c2eb5 (commit)
       via  93db16f42ed2f7f9a4e74ff24d9792655cf39923 (commit)
       via  e58f39be58ab352d19907079eeaf2fa9730c1bfe (commit)
       via  e12e22c0f55f1c4366b06d012addba44dbc5f7d8 (commit)
       via  479e9a2511d9b54f1631de33027f6cdb4c576128 (commit)
       via  3aad6008d82058864e680e34837519213a239293 (commit)
       via  ad085a257d057f604939b00a13eb72f99c52df17 (commit)
       via  60d72d50ddb51db1ec66ba5085256261b8423125 (commit)
       via  b629d9e88ad0c6e62018a8fb4768013975eccc70 (commit)
       via  72b1b3b28fb13528a8c6ea5b8ee5ac62d69be28d (commit)
       via  9886b0f0059b31dd28482f63f32c40671f30396f (commit)
       via  ecea0fa102bea186e752b20386c4a59d86ec7c92 (commit)
       via  d6f2d88621fb4f70674e669fe92df23f3e866dc4 (commit)
       via  8a9d909c5a407a9aedcdc333ec4cfa3f1762b3c3 (commit)
       via  8dfb0e3f8ca8154f4c16ab26e03aa6c6b114b5ad (commit)
       via  acb06e145fc50740496a34d2804e3438b2ddb2b1 (commit)
       via  84485330ff92a496763d1e471f8ed666e6da0a4f (commit)
      from  b3a016e9a47d453b5ae4d287d8b6eaafd69971df (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 83ee4d3ebf739f8aad67cf8faea093fc71d24d01
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jul 22 13:05:35 2019 -0400

    14287: Comment multi-dimensional map.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index 43ed2cdba..124946de0 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -140,6 +140,11 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 		}
 	}
 
+	// Collate UUIDs in matchAllFilters by remote cluster ID --
+	// e.g., todoByRemote["aaaaa"]["aaaaa-4zz18-000000000000000"]
+	// will be true -- and count the total number of UUIDs we're
+	// filtering on, so we can compare it to our max page size
+	// limit.
 	nUUIDs := 0
 	todoByRemote := map[string]map[string]bool{}
 	for uuid := range matchAllFilters {

commit bd857c2152f66bc17745edcc5a7a88377024ff43
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jul 22 13:05:01 2019 -0400

    14287: Fix comment that looked too much like real code.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index 4843baa5c..43ed2cdba 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -130,7 +130,8 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 		if matchAllFilters == nil {
 			matchAllFilters = matchThisFilter
 		} else {
-			// matchAllFilters = intersect(matchAllFilters, matchThisFilter)
+			// Reduce matchAllFilters to the intersection
+			// of matchAllFilters ∩ matchThisFilter.
 			for uuid := range matchAllFilters {
 				if !matchThisFilter[uuid] {
 					delete(matchAllFilters, uuid)

commit 57c70faf4f31c619984b17331b636f941c84ea05
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jul 22 13:04:07 2019 -0400

    14287: Clarify use of separate variables in goroutine.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index 5a171c9c3..4843baa5c 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -181,14 +181,14 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 	defer cancel()
 	errs := make(chan error, len(todoByRemote))
 	for clusterID, todo := range todoByRemote {
-		clusterID, todo := clusterID, todo
-		batch := make([]string, 0, len(todo))
-		for uuid := range todo {
-			batch = append(batch, uuid)
-		}
-		go func() {
+		go func(clusterID string, todo map[string]bool) {
 			// This goroutine sends exactly one value to
 			// errs.
+			batch := make([]string, 0, len(todo))
+			for uuid := range todo {
+				batch = append(batch, uuid)
+			}
+
 			var backend arvados.API
 			if clusterID == conn.cluster.ClusterID {
 				backend = conn.local
@@ -225,13 +225,13 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 				}
 			}
 			errs <- nil
-		}()
+		}(clusterID, todo)
 	}
 
 	// Wait for all goroutines to return, then return the first
 	// non-nil error, if any.
 	var firstErr error
-	for i := 0; i < len(todoByRemote); i++ {
+	for range todoByRemote {
 		if err := <-errs; err != nil && firstErr == nil {
 			firstErr = err
 			// Signal to any remaining fn() calls that

commit 91cd750b78b39195b0e8f3328a3e7f34484172a3
Merge: b3a016e9a c1cf71ba7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jul 22 11:25:03 2019 -0400

    14287: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list