[ARVADOS] updated: 1.3.0-2864-g615e28072

[Git user]

Summary of changes:
 .../app/views/application/_show_sharing.html.erb   |  2 +
 doc/install/install-keep-web.html.textile.liquid   |  1 +
 doc/install/install-keepproxy.html.textile.liquid  |  1 +
 doc/user/cwl/cwl-versions.html.textile.liquid      |  8 ++-
 lib/config/deprecated_test.go                      |  1 +
 lib/config/load_test.go                            |  1 +
 lib/controller/federation/generated.go             |  3 ++
 lib/controller/federation/list.go                  |  5 +-
 lib/controller/integration_test.go                 |  1 +
 lib/controller/localdb/login_ldap_test.go          |  1 +
 lib/controller/router/router_test.go               |  2 +-
 lib/controller/rpc/conn_test.go                    |  4 ++
 lib/dispatchcloud/scheduler/sync_test.go           | 12 +++++
 lib/pam/pam_arvados.go                             |  2 +-
 lib/recovercollection/cmd_test.go                  |  1 +
 lib/service/cmd_test.go                            |  1 +
 sdk/cwl/arvados_cwl/__init__.py                    | 15 +++---
 ...cwl-schema-v1.1.yml => arv-cwl-schema-v1.2.yml} |  0
 sdk/cwl/setup.py                                   |  4 +-
 sdk/go/arvados/api.go                              |  1 +
 sdk/go/arvados/duration_test.go                    |  1 +
 sdk/go/arvados/fs_project_test.go                  |  1 +
 sdk/go/arvados/fs_site_test.go                     |  2 +
 sdk/go/arvadosclient/arvadosclient_test.go         |  5 ++
 sdk/go/httpserver/logger_test.go                   |  4 ++
 sdk/go/keepclient/collectionreader_test.go         | 10 ++--
 sdk/go/keepclient/keepclient_test.go               | 23 ++++++++
 sdk/python/tests/fed-migrate/check.py              | 61 ++++++++++++++++++++++
 services/api/app/models/arvados_model.rb           | 25 +++++----
 services/api/app/models/link.rb                    | 27 ++++++++++
 services/api/test/unit/link_test.rb                |  8 +++
 services/keep-balance/main_test.go                 |  1 +
 services/keepstore/s3aws_volume_test.go            |  3 ++
 33 files changed, 207 insertions(+), 30 deletions(-)
 copy sdk/cwl/arvados_cwl/{arv-cwl-schema-v1.1.yml => arv-cwl-schema-v1.2.yml} (100%)

       via  615e280721c4be51556e2c31b4baffa69dd0d6d8 (commit)
       via  7cc257b4e4f60cca1ca0354d9972cb36c59a77fe (commit)
       via  9833a2b9be1a722bd9aad08baf48ca072bde7ca7 (commit)
       via  04ab4d44425ff9cd5556c5978d85da3b6750e91c (commit)
       via  4901a3c5f9442e8b884eb73b37da6272150c57a2 (commit)
       via  78444f2fb480801787e486d4b65198d72ab4fe15 (commit)
       via  2580743536835baedf91288dfb3599c0b11a3464 (commit)
       via  877689fc26b0b69a94ca525a3bca1ed2236fb4b2 (commit)
       via  70838209c214bfa57ef4bce289e1530a1cc2b081 (commit)
       via  046863fce3eefdd8f2b4588855b2335dcb0215e1 (commit)
       via  5fde4c5e8c464ec55d002735003a564a7802c720 (commit)
       via  de89bbf6824a39990e1605e4bd041b5d1ed464ea (commit)
       via  2ba6cc7a5e4bfd05cd51e8ab22be2a99a883349d (commit)
       via  ab92008f810e7cdbea981ce903670621c54c082e (commit)
       via  45c611003d84157370f7356b62ba8aa6972535a1 (commit)
       via  da283ea8958220d42431b43e05d40494365eee55 (commit)
       via  c6858cd333d073c972d6c050d2910f1c23f200d2 (commit)
       via  a44e0b163687a53bebf89472e4643e68cf1c567c (commit)
       via  509084f45ffd17d740f7a26285210f8cde51f84c (commit)
      from  b2a1842d611a2739066a819badafaa2d2f14015d (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 615e280721c4be51556e2c31b4baffa69dd0d6d8
Merge: 7cc257b4e 9833a2b9b
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon Aug 17 10:17:28 2020 -0400

    16663: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>


commit 7cc257b4e4f60cca1ca0354d9972cb36c59a77fe
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon Aug 17 10:16:47 2020 -0400

    16663: Add comments in racy test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/dispatchcloud/scheduler/sync_test.go b/lib/dispatchcloud/scheduler/sync_test.go
index ae264bb29..538f5ea8c 100644
--- a/lib/dispatchcloud/scheduler/sync_test.go
+++ b/lib/dispatchcloud/scheduler/sync_test.go
@@ -84,6 +84,14 @@ func (*SchedulerSuite) TestCancelOrphanedContainers(c *check.C) {
 
 	// Sync shouldn't cancel the container because it might be
 	// running on the VM with state=="unknown".
+	//
+	// (Cancel+forget happens asynchronously and requires multiple
+	// sync() calls, so even after 10x sync-and-sleep iterations,
+	// we aren't 100% confident that sync isn't trying to
+	// cancel. But in the test environment, the goroutines started
+	// by sync() access stubs and therefore run quickly, so it
+	// works fine in practice. We accept that if the code is
+	// broken, the test will still pass occasionally.)
 	for i := 0; i < 10; i++ {
 		sch.sync()
 		time.Sleep(time.Millisecond)
@@ -94,6 +102,10 @@ func (*SchedulerSuite) TestCancelOrphanedContainers(c *check.C) {
 
 	// Sync should cancel & forget the container when the
 	// "unknown" node goes away.
+	//
+	// (As above, cancel+forget is async and requires multiple
+	// sync() calls, but stubs are fast so in practice this takes
+	// much less than 1s to complete.)
 	pool.unknown = nil
 	for deadline := time.Now().Add(time.Second); ; time.Sleep(time.Millisecond) {
 		sch.sync()

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


hooks/post-receive
--