[ARVADOS] updated: 1.3.0-2496-g69f5a2fae

[Git user]

Summary of changes:
 build/run-library.sh                 | 4 +++-
 services/keepproxy/keepproxy_test.go | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

  discards  230e87b9f39d79628607056c7e950e209a53c60d (commit)
       via  69f5a2fae926d745a618c0a33499a4b04d65816d (commit)
       via  66c1d31ea7efc7e3eff8d3ff43fdfc0dbcca3c3e (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 (230e87b9f39d79628607056c7e950e209a53c60d)
            \
             N -- N -- N (69f5a2fae926d745a618c0a33499a4b04d65816d)

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 69f5a2fae926d745a618c0a33499a4b04d65816d
Author: Ward Vandewege <ward at jhvc.com>
Date:   Tue Apr 14 10:47:47 2020 -0400

    tests: timer() is sometimes called in an error path, when case
    timer_reset() was not called first. That means $t0 is not set, which
    means timer() can't do its math. Stop it from printing an error in that
    case.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index ac5dc718b..b39d10b2c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -912,7 +912,9 @@ timer_reset() {
 }
 
 timer() {
-    echo -n "$(($SECONDS - $t0))s"
+    if [[ ! -z "$t0" ]]; then
+        echo -n "$(($SECONDS - $t0))s"
+    fi
 }
 
 report_outcomes() {

commit 66c1d31ea7efc7e3eff8d3ff43fdfc0dbcca3c3e
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
--