X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/282536bbd088d06455053e4599051ad6352728b9..08d0b1ab43499b7f13462d5e3555d239b4634d22:/sdk/go/keepclient/discover.go

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index 2392fcde7b..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"
@@ -150,7 +151,12 @@ 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() {