X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bbf13d5bc532c5222a933317461f187a0e118c9a..607fe087f6167061714a524dd53cbbc21b974973:/sdk/go/keepclient/discover.go

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index 099c56f343..f3e3960698 100644
--- a/sdk/go/keepclient/discover.go
+++ b/sdk/go/keepclient/discover.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"net/http"
 	"os"
 	"os/signal"
 	"reflect"
@@ -12,16 +13,34 @@ import (
 	"time"
 )
 
-// DiscoverKeepServers gets list of available keep services from api server
+// DiscoverKeepServers gets list of available keep services from the
+// API server.
+//
+// If a list of services is provided in the arvadosclient (e.g., from
+// an environment variable or local config), that list is used
+// instead.
 func (this *KeepClient) DiscoverKeepServers() error {
-	var list svcList
+	if this.Arvados.KeepServiceURIs != nil {
+		this.foundNonDiskSvc = true
+		this.replicasPerService = 0
+		if c, ok := this.Client.(*http.Client); ok {
+			this.setClientSettingsNonDisk(c)
+		}
+		roots := make(map[string]string)
+		for i, uri := range this.Arvados.KeepServiceURIs {
+			roots[fmt.Sprintf("00000-bi6l4-%015d", i)] = uri
+		}
+		this.SetServiceRoots(roots, roots, roots)
+		return nil
+	}
 
-	// Get keep services from api server
+	// ArvadosClient did not provide a services list. Ask API
+	// server for a list of accessible services.
+	var list svcList
 	err := this.Arvados.Call("GET", "keep_services", "", "accessible", nil, &list)
 	if err != nil {
 		return err
 	}
-
 	return this.loadKeepServers(list)
 }
 
@@ -57,14 +76,14 @@ func (kc *KeepClient) RefreshServices(interval, errInterval time.Duration) {
 		timer.Reset(interval)
 
 		if err := kc.DiscoverKeepServers(); err != nil {
-			log.Println("Error retrieving services list: %v (retrying in %v)", err, errInterval)
+			log.Printf("WARNING: Error retrieving services list: %v (retrying in %v)", err, errInterval)
 			timer.Reset(errInterval)
 			continue
 		}
 		newRoots := []map[string]string{kc.LocalRoots(), kc.GatewayRoots()}
 
 		if !reflect.DeepEqual(previousRoots, newRoots) {
-			log.Printf("Updated services list: locals %v gateways %v", newRoots[0], newRoots[1])
+			DebugPrintf("DEBUG: Updated services list: locals %v gateways %v", newRoots[0], newRoots[1])
 			previousRoots = newRoots
 		}
 
@@ -118,10 +137,12 @@ func (this *KeepClient) loadKeepServers(list svcList) error {
 		gatewayRoots[service.Uuid] = url
 	}
 
-	if this.foundNonDiskSvc {
-		this.setClientSettingsNonDisk()
-	} else {
-		this.setClientSettingsDisk()
+	if client, ok := this.Client.(*http.Client); ok {
+		if this.foundNonDiskSvc {
+			this.setClientSettingsNonDisk(client)
+		} else {
+			this.setClientSettingsDisk(client)
+		}
 	}
 
 	this.SetServiceRoots(localRoots, writableLocalRoots, gatewayRoots)