[ARVADOS] updated: 1.2.0-147-g005951a5e

[Git user]

Summary of changes:
 sdk/go/keepclient/discover.go                      | 14 ++++++++++++--
 services/keepstore/pull_worker_integration_test.go |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

       via  005951a5e62a55894eace6e8fb3fe91d5c4ba84c (commit)
      from  fde27ce0e46521db9828c228e7fb531e003724a8 (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 005951a5e62a55894eace6e8fb3fe91d5c4ba84c
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Oct 4 14:01:00 2018 -0400

    14199: Fix deadlock in test suite.
    
    If a KeepClient has been created using an API server address that is
    no longer reachable, calling keepclient.RefreshServiceDiscovery() puts
    the poll() goroutine into an endless retry loop, and a second call
    never returns because ent.clear is never ready to receive.
    
    Work around this in the pull worker tests by only refreshing services
    from the API server actually being used, not on additional ones
    referenced by previous test cases.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index 4377c1951..2392fcde7 100644
--- a/sdk/go/keepclient/discover.go
+++ b/sdk/go/keepclient/discover.go
@@ -20,9 +20,10 @@ import (
 
 // ClearCache clears the Keep service discovery cache.
 func RefreshServiceDiscovery() {
+	var wg sync.WaitGroup
+	defer wg.Wait()
 	svcListCacheMtx.Lock()
 	defer svcListCacheMtx.Unlock()
-	var wg sync.WaitGroup
 	for _, ent := range svcListCache {
 		wg.Add(1)
 		go func() {
@@ -30,7 +31,6 @@ func RefreshServiceDiscovery() {
 			wg.Done()
 		}()
 	}
-	wg.Wait()
 }
 
 // ClearCacheOnSIGHUP installs a signal handler that calls
@@ -153,6 +153,16 @@ func (kc *KeepClient) discoverServices() error {
 	return kc.loadKeepServers(<-cacheEnt.latest)
 }
 
+func (kc *KeepClient) RefreshServiceDiscovery() {
+	svcListCacheMtx.Lock()
+	ent, ok := svcListCache[kc.Arvados.ApiServer]
+	svcListCacheMtx.Unlock()
+	if !ok || kc.Arvados.KeepServiceURIs != nil || kc.disableDiscovery {
+		return
+	}
+	ent.clear <- struct{}{}
+}
+
 // LoadKeepServicesFromJSON gets list of available keep services from
 // given JSON and disables automatic service discovery.
 func (kc *KeepClient) LoadKeepServicesFromJSON(services string) error {
diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index c06bbe05c..231a4c0ab 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -33,7 +33,6 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
 	// start api and keep servers
 	arvadostest.StartAPI()
 	arvadostest.StartKeep(2, false)
-	keepclient.RefreshServiceDiscovery()
 
 	// make arvadosclient
 	arv, err := arvadosclient.MakeArvadosClient()
@@ -47,6 +46,7 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
 		t.Fatalf("error creating KeepClient: %s", err)
 	}
 	keepClient.Want_replicas = 1
+	keepClient.RefreshServiceDiscovery()
 
 	// discover keep services
 	var servers []string

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


hooks/post-receive
--