X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0eb72b526bf8bbb011551ecf019f604e17a534f1..bf08477c7e766c7692731c08212c8d1c3c5628ea:/sdk/go/keepclient/discover.go

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index 2140dceabb..62936e7183 100644
--- a/sdk/go/keepclient/discover.go
+++ b/sdk/go/keepclient/discover.go
@@ -6,6 +6,7 @@ package keepclient
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -20,10 +21,16 @@ import (
 
 // ClearCache clears the Keep service discovery cache.
 func RefreshServiceDiscovery() {
+	var wg sync.WaitGroup
+	defer wg.Wait()
 	svcListCacheMtx.Lock()
 	defer svcListCacheMtx.Unlock()
 	for _, ent := range svcListCache {
-		ent.clear <- struct{}{}
+		wg.Add(1)
+		go func() {
+			ent.clear <- struct{}{}
+			wg.Done()
+		}()
 	}
 }
 
@@ -144,7 +151,22 @@ func (kc *KeepClient) discoverServices() error {
 	}
 	svcListCacheMtx.Unlock()
 
-	return kc.loadKeepServers(<-cacheEnt.latest)
+	select {
+	case <-time.After(time.Minute):
+		return errors.New("timed out while getting initial list of keep services")
+	case sl := <-cacheEnt.latest:
+		return kc.loadKeepServers(sl)
+	}
+}
+
+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