7167: Tidy up errors. Remove extra comment copy.

[arvados.git] / sdk / go / keepclient / support.go

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 4cc644749a391689814e582d7dd5b8624dc9f608..63800b1e08577edec185cab13bc6c97780b349b1 100644 (file)
--- 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,9 @@ 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 {
                scheme := "http"
@@ -235,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) {