projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20138-fix-sync-test-race'
[arvados.git]
/
sdk
/
go
/
keepclient
/
discover.go
diff --git
a/sdk/go/keepclient/discover.go
b/sdk/go/keepclient/discover.go
index 744ff826853895c1769a5865d8dbded75ddc1474..5eafbbe339a9d7d4baa29081a049aa5e924ac61f 100644
(file)
--- a/
sdk/go/keepclient/discover.go
+++ b/
sdk/go/keepclient/discover.go
@@
-19,7
+19,7
@@
import (
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
)
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
)
-//
ClearCache
clears the Keep service discovery cache.
+//
RefreshServiceDiscovery
clears the Keep service discovery cache.
func RefreshServiceDiscovery() {
var wg sync.WaitGroup
defer wg.Wait()
func RefreshServiceDiscovery() {
var wg sync.WaitGroup
defer wg.Wait()
@@
-35,8
+35,8
@@
func RefreshServiceDiscovery() {
}
}
}
}
-//
ClearCache
OnSIGHUP installs a signal handler that calls
-//
ClearCache
when SIGHUP is received.
+//
RefreshServiceDiscovery
OnSIGHUP installs a signal handler that calls
+//
RefreshServiceDiscovery
when SIGHUP is received.
func RefreshServiceDiscoveryOnSIGHUP() {
svcListCacheMtx.Lock()
defer svcListCacheMtx.Unlock()
func RefreshServiceDiscoveryOnSIGHUP() {
svcListCacheMtx.Lock()
defer svcListCacheMtx.Unlock()
@@
-138,6
+138,10
@@
func (kc *KeepClient) discoverServices() error {
return nil
}
return nil
}
+ if kc.Arvados.ApiServer == "" {
+ return fmt.Errorf("Arvados client is not configured (target API host is not set). Maybe env var ARVADOS_API_HOST should be set first?")
+ }
+
svcListCacheMtx.Lock()
cacheEnt, ok := svcListCache[kc.Arvados.ApiServer]
if !ok {
svcListCacheMtx.Lock()
cacheEnt, ok := svcListCache[kc.Arvados.ApiServer]
if !ok {