[ARVADOS] updated: 2.1.0-97-ge8e643444

[Git user]

Summary of changes:
 sdk/go/keepclient/keepclient.go      | 2 +-
 sdk/go/keepclient/keepclient_test.go | 2 +-
 sdk/go/keepclient/support.go         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

       via  e8e6434446cc88d7850f158d3c016d4039b25e81 (commit)
      from  82e63aa2aeaf2747a21058498f234f135d9867a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e8e6434446cc88d7850f158d3c016d4039b25e81
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Nov 16 20:40:47 2020 -0500

    Fix more golint warnings.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index ec56e902c..21913ff96 100644
--- 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 8d595fbe1..59c412724 100644
--- 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 6a31c98bc..91117f2d3 100644
--- 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!

-----------------------------------------------------------------------


hooks/post-receive
--