X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/67f730557e062608f842fa3abc612fb717fbce2f..20c5b73d598463a7dfb4ce711993480d56e23838:/sdk/go/keepclient/support.go

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 2a0b166961..63800b1e08 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -14,7 +14,7 @@ import (
 	"time"
 )
 
-type keepServices struct {
+type keepService struct {
 	Uuid     string `json:"uuid"`
 	Hostname string `json:"service_host"`
 	Port     int    `json:"service_port"`
@@ -79,18 +79,14 @@ func (this *KeepClient) setClientSettingsDisk() {
 // DiscoverKeepServers gets list of available keep services from api server
 func (this *KeepClient) DiscoverKeepServers() error {
 	type svcList struct {
-		Items []keepServices `json:"items"`
+		Items []keepService `json:"items"`
 	}
 	var m svcList
 
 	// Get keep services from api server
 	err := this.Arvados.Call("GET", "keep_services", "", "accessible", nil, &m)
-
-	// If there is error getting keep services, get list of keep disks
 	if err != nil {
-		if err := this.Arvados.List("keep_disks", nil, &m); err != nil {
-			return err
-		}
+		return err
 	}
 
 	listed := make(map[string]bool)
@@ -98,7 +94,8 @@ func (this *KeepClient) DiscoverKeepServers() error {
 	gatewayRoots := make(map[string]string)
 	writableLocalRoots := make(map[string]string)
 
-	this.replicasPerService = 1 // set to 1 until writable non-disk services are found
+	// replicasPerService is 1 for disks; unknown or unlimited otherwise
+	this.replicasPerService = 1
 	this.Using_proxy = false
 
 	for _, service := range m.Items {
@@ -236,13 +233,13 @@ func (this KeepClient) putReplicas(
 	// Desired number of replicas
 	remaining_replicas := this.Want_replicas
 
-	for remaining_replicas > 0 {
-		replicasPerThread := this.replicasPerService
-		if replicasPerThread < 1 {
-			// unlimited or unknown
-			replicasPerThread = remaining_replicas
-		}
+	replicasPerThread := this.replicasPerService
+	if replicasPerThread < 1 {
+		// unlimited or unknown
+		replicasPerThread = remaining_replicas
+	}
 
+	for remaining_replicas > 0 {
 		for active*replicasPerThread < remaining_replicas {
 			// Start some upload requests
 			if next_server < len(sv) {