[ARVADOS] updated: 1.3.0-2497-g0887e5340

[Git user]

Summary of changes:
 build/run-library.sh                  | 2 +-
 sdk/python/tests/run_test_server.py   | 1 -
 services/api/config/arvados_config.rb | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)

  discards  69f5a2fae926d745a618c0a33499a4b04d65816d (commit)
  discards  66c1d31ea7efc7e3eff8d3ff43fdfc0dbcca3c3e (commit)
  discards  8c4a0d0daa0d7cdad24404947ae6b2be1fd78297 (commit)
  discards  533ec23ed1f94c83b78a8dc27c3084a7bb18f0d8 (commit)
       via  0887e53403ebe3ffe4ef1d64090c0663be1ee270 (commit)
       via  91aeea6d741f2bec6ecdc32d24537cf0f2a7328a (commit)
       via  565477d2995de8620ca87c300d5db62fea6a406f (commit)
       via  29e4223baf6aa8ef2c66bb5258a7586dd6c38a75 (commit)
       via  727b97086f9ec060b9411b887d635017852d17cd (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (69f5a2fae926d745a618c0a33499a4b04d65816d)
            \
             N -- N -- N (0887e53403ebe3ffe4ef1d64090c0663be1ee270)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 0887e53403ebe3ffe4ef1d64090c0663be1ee270
Author: Ward Vandewege <ward at jhvc.com>
Date:   Mon Apr 13 17:57:03 2020 -0400

    If config.yml is available, use the keepstores defined there instead of
    the legacy autodiscover mechanism via the API server.
    
    refs #16328
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 2b15d7994..547e77e5f 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -116,6 +116,12 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
 		return fmt.Errorf("Error setting up arvados client %v", err)
 	}
 
+	// If a config file is available, use the keepstores defined there
+	// instead of the legacy autodiscover mechanism via the API server
+	for k := range cluster.Services.Keepstore.InternalURLs {
+		arv.KeepServiceURIs = append(arv.KeepServiceURIs, k.String())
+	}
+
 	if cluster.SystemLogs.LogLevel == "debug" {
 		keepclient.DebugPrintf = log.Printf
 	}
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index aa3235680..5ca702b6d 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -105,6 +105,9 @@ func runProxy(c *C, bogusClientToken bool) *keepclient.KeepClient {
 	cluster, err := cfg.GetCluster("")
 	c.Assert(err, Equals, nil)
 
+	// Do not load Keepstore InternalURLs from the config file
+	cluster.Services.Keepstore.InternalURLs = make(map[arvados.URL]arvados.ServiceInstance)
+
 	cluster.Services.Keepproxy.InternalURLs = map[arvados.URL]arvados.ServiceInstance{arvados.URL{Host: ":0"}: arvados.ServiceInstance{}}
 
 	listener = nil

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


hooks/post-receive
--