Merge branch 'master' into 17012-fix-python-version-calculation

refs #17012

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index ec56e902c88d1ea8bcf484976d58d5bb2aae589e..21913ff967c79f2a56058f79e3688f42acc00e2d 100644 (file)
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -227,7 +227,7 @@ func (kc *KeepClient) getOrHead(method string, locator string, header http.Heade
        var retryList []string
 
        for triesRemaining > 0 {
-               triesRemaining -= 1
+               triesRemaining--
                retryList = nil
 
                for _, host := range serversToTry {

diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 8d595fbe14016e96645c39c2db4dae494c26b151..59c4127240eee14a70680b96063d767ffe99ddce 100644 (file)
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -209,7 +209,7 @@ func (fh *FailThenSucceedHandler) ServeHTTP(resp http.ResponseWriter, req *http.
        fh.reqIDs = append(fh.reqIDs, req.Header.Get("X-Request-Id"))
        if fh.count == 0 {
                resp.WriteHeader(500)
-               fh.count += 1
+               fh.count++
                fh.handled <- fmt.Sprintf("http://%s", req.Host)
        } else {
                fh.successhandler.ServeHTTP(resp, req)

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 6a31c98bc6596a5f946fc73ec0a8d22a66238b80..91117f2d3216ea317b05761b155a42e9e00f2da6 100644 (file)
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -161,7 +161,7 @@ func (this *KeepClient) putReplicas(
        lastError := make(map[string]string)
 
        for retriesRemaining > 0 {
-               retriesRemaining -= 1
+               retriesRemaining--
                nextServer = 0
                retryServers = []string{}
                for replicasTodo > 0 {
@@ -170,8 +170,8 @@ func (this *KeepClient) putReplicas(
                                if nextServer < len(sv) {
                                        DebugPrintf("DEBUG: [%s] Begin upload %s to %s", reqid, hash, sv[nextServer])
                                        go this.uploadToKeepServer(sv[nextServer], hash, getReader(), uploadStatusChan, expectedLength, reqid)
-                                       nextServer += 1
-                                       active += 1
+                                       nextServer++
+                                       active++
                                } else {
                                        if active == 0 && retriesRemaining == 0 {
                                                msg := "Could not write sufficient replicas: "
@@ -190,7 +190,7 @@ func (this *KeepClient) putReplicas(
                        // Now wait for something to happen.
                        if active > 0 {
                                status := <-uploadStatusChan
-                               active -= 1
+                               active--
 
                                if status.statusCode == 200 {
                                        // good news!