Merge branch '10700-dispatch'

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

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index b904b099cb1e946966075f8cf14c25adbab0f3be..22447794f1c7f93c4eca6fcdec83d254cbc1740b 100644 (file)
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -7,7 +7,6 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/streamer"
        "io"
        "io/ioutil"
-       "log"
        "math/rand"
        "net"
        "net/http"
@@ -101,7 +100,7 @@ func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Rea
        var err error
        var url = fmt.Sprintf("%s/%s", host, hash)
        if req, err = http.NewRequest("PUT", url, nil); err != nil {
-               log.Printf("[%08x] Error creating request PUT %v error: %v", requestID, url, err.Error())
+               DebugPrintf("DEBUG: [%08x] Error creating request PUT %v error: %v", requestID, url, err.Error())
                upload_status <- uploadStatus{err, url, 0, 0, ""}
                body.Close()
                return
@@ -126,7 +125,7 @@ func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Rea
 
        var resp *http.Response
        if resp, err = this.Client.Do(req); err != nil {
-               log.Printf("[%08x] Upload failed %v error: %v", requestID, url, err.Error())
+               DebugPrintf("DEBUG: [%08x] Upload failed %v error: %v", requestID, url, err.Error())
                upload_status <- uploadStatus{err, url, 0, 0, ""}
                return
        }
@@ -142,13 +141,13 @@ func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Rea
        respbody, err2 := ioutil.ReadAll(&io.LimitedReader{R: resp.Body, N: 4096})
        response := strings.TrimSpace(string(respbody))
        if err2 != nil && err2 != io.EOF {
-               log.Printf("[%08x] Upload %v error: %v response: %v", requestID, url, err2.Error(), response)
+               DebugPrintf("DEBUG: [%08x] Upload %v error: %v response: %v", requestID, url, err2.Error(), response)
                upload_status <- uploadStatus{err2, url, resp.StatusCode, rep, response}
        } else if resp.StatusCode == http.StatusOK {
-               log.Printf("[%08x] Upload %v success", requestID, url)
+               DebugPrintf("DEBUG: [%08x] Upload %v success", requestID, url)
                upload_status <- uploadStatus{nil, url, resp.StatusCode, rep, response}
        } else {
-               log.Printf("[%08x] Upload %v error: %v response: %v", requestID, url, resp.StatusCode, response)
+               DebugPrintf("DEBUG: [%08x] Upload %v error: %v response: %v", requestID, url, resp.StatusCode, response)
                upload_status <- uploadStatus{errors.New(resp.Status), url, resp.StatusCode, rep, response}
        }
 }
@@ -185,13 +184,13 @@ func (this *KeepClient) putReplicas(
                }()
        }()
 
-       // Desired number of replicas
-       remaining_replicas := this.Want_replicas
+       replicasDone := 0
+       replicasTodo := this.Want_replicas
 
        replicasPerThread := this.replicasPerService
        if replicasPerThread < 1 {
                // unlimited or unknown
-               replicasPerThread = remaining_replicas
+               replicasPerThread = replicasTodo
        }
 
        retriesRemaining := 1 + this.Retries
@@ -201,24 +200,24 @@ func (this *KeepClient) putReplicas(
                retriesRemaining -= 1
                next_server = 0
                retryServers = []string{}
-               for remaining_replicas > 0 {
-                       for active*replicasPerThread < remaining_replicas {
+               for replicasTodo > 0 {
+                       for active*replicasPerThread < replicasTodo {
                                // Start some upload requests
                                if next_server < len(sv) {
-                                       log.Printf("[%08x] Begin upload %s to %s", requestID, hash, sv[next_server])
+                                       DebugPrintf("DEBUG: [%08x] Begin upload %s to %s", requestID, hash, sv[next_server])
                                        go this.uploadToKeepServer(sv[next_server], hash, tr.MakeStreamReader(), upload_status, expectedLength, requestID)
                                        next_server += 1
                                        active += 1
                                } else {
                                        if active == 0 && retriesRemaining == 0 {
-                                               return locator, (this.Want_replicas - remaining_replicas), InsufficientReplicasError
+                                               return locator, replicasDone, InsufficientReplicasError
                                        } else {
                                                break
                                        }
                                }
                        }
-                       log.Printf("[%08x] Replicas remaining to write: %v active uploads: %v",
-                               requestID, remaining_replicas, active)
+                       DebugPrintf("DEBUG: [%08x] Replicas remaining to write: %v active uploads: %v",
+                               requestID, replicasTodo, active)
 
                        // Now wait for something to happen.
                        if active > 0 {
@@ -227,7 +226,8 @@ func (this *KeepClient) putReplicas(
 
                                if status.statusCode == 200 {
                                        // good news!
-                                       remaining_replicas -= status.replicas_stored
+                                       replicasDone += status.replicas_stored
+                                       replicasTodo -= status.replicas_stored
                                        locator = status.response
                                } else if status.statusCode == 0 || status.statusCode == 408 || status.statusCode == 429 ||
                                        (status.statusCode >= 500 && status.statusCode != 503) {
@@ -243,5 +243,5 @@ func (this *KeepClient) putReplicas(
                sv = retryServers
        }
 
-       return locator, this.Want_replicas, nil
+       return locator, replicasDone, nil
 }