X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..6d95130da47af9fd0290d3c8f80a0364faf74957:/sdk/go/keepclient/support.go

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 49ef543d87..71b4b5ed26 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -11,13 +11,11 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-	"math/rand"
 	"net/http"
 	"os"
 	"strings"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/streamer"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
 )
 
 // Function used to emit debug messages. The easiest way to enable
@@ -57,40 +55,39 @@ type uploadStatus struct {
 	response        string
 }
 
-func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.ReadCloser,
-	upload_status chan<- uploadStatus, expectedLength int64, requestID int32) {
+func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Reader,
+	upload_status chan<- uploadStatus, expectedLength int64, reqid string) {
 
 	var req *http.Request
 	var err error
 	var url = fmt.Sprintf("%s/%s", host, hash)
 	if req, err = http.NewRequest("PUT", url, nil); err != nil {
-		DebugPrintf("DEBUG: [%08x] Error creating request PUT %v error: %v", requestID, url, err.Error())
+		DebugPrintf("DEBUG: [%s] Error creating request PUT %v error: %v", reqid, url, err.Error())
 		upload_status <- uploadStatus{err, url, 0, 0, ""}
-		body.Close()
 		return
 	}
 
 	req.ContentLength = expectedLength
 	if expectedLength > 0 {
-		// Do() will close the body ReadCloser when it is done
-		// with it.
-		req.Body = body
+		req.Body = ioutil.NopCloser(body)
 	} else {
-		// "For client requests, a value of 0 means unknown if Body is
-		// not nil."  In this case we do want the body to be empty, so
-		// don't set req.Body.  However, we still need to close the
-		// body ReadCloser.
-		body.Close()
+		// "For client requests, a value of 0 means unknown if
+		// Body is not nil."  In this case we do want the body
+		// to be empty, so don't set req.Body.
 	}
 
-	req.Header.Add("Authorization", fmt.Sprintf("OAuth2 %s", this.Arvados.ApiToken))
+	req.Header.Add("X-Request-Id", reqid)
+	req.Header.Add("Authorization", "OAuth2 "+this.Arvados.ApiToken)
 	req.Header.Add("Content-Type", "application/octet-stream")
 	req.Header.Add(X_Keep_Desired_Replicas, fmt.Sprint(this.Want_replicas))
+	if len(this.StorageClasses) > 0 {
+		req.Header.Add("X-Keep-Storage-Classes", strings.Join(this.StorageClasses, ", "))
+	}
 
 	var resp *http.Response
 	if resp, err = this.httpClient().Do(req); err != nil {
-		DebugPrintf("DEBUG: [%08x] Upload failed %v error: %v", requestID, url, err.Error())
-		upload_status <- uploadStatus{err, url, 0, 0, ""}
+		DebugPrintf("DEBUG: [%s] Upload failed %v error: %v", reqid, url, err.Error())
+		upload_status <- uploadStatus{err, url, 0, 0, err.Error()}
 		return
 	}
 
@@ -105,28 +102,26 @@ 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 {
-		DebugPrintf("DEBUG: [%08x] Upload %v error: %v response: %v", requestID, url, err2.Error(), response)
+		DebugPrintf("DEBUG: [%s] Upload %v error: %v response: %v", reqid, url, err2.Error(), response)
 		upload_status <- uploadStatus{err2, url, resp.StatusCode, rep, response}
 	} else if resp.StatusCode == http.StatusOK {
-		DebugPrintf("DEBUG: [%08x] Upload %v success", requestID, url)
+		DebugPrintf("DEBUG: [%s] Upload %v success", reqid, url)
 		upload_status <- uploadStatus{nil, url, resp.StatusCode, rep, response}
 	} else {
 		if resp.StatusCode >= 300 && response == "" {
 			response = resp.Status
 		}
-		DebugPrintf("DEBUG: [%08x] Upload %v error: %v response: %v", requestID, url, resp.StatusCode, response)
+		DebugPrintf("DEBUG: [%s] Upload %v error: %v response: %v", reqid, url, resp.StatusCode, response)
 		upload_status <- uploadStatus{errors.New(resp.Status), url, resp.StatusCode, rep, response}
 	}
 }
 
 func (this *KeepClient) putReplicas(
 	hash string,
-	tr *streamer.AsyncStream,
+	getReader func() io.Reader,
 	expectedLength int64) (locator string, replicas int, err error) {
 
-	// Generate an arbitrary ID to identify this specific
-	// transaction in debug logs.
-	requestID := rand.Int31()
+	reqid := this.getRequestID()
 
 	// Calculate the ordering for uploading to servers
 	sv := NewRootSorter(this.WritableLocalRoots(), hash).GetSortedRoots()
@@ -173,8 +168,8 @@ func (this *KeepClient) putReplicas(
 			for active*replicasPerThread < replicasTodo {
 				// Start some upload requests
 				if next_server < len(sv) {
-					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)
+					DebugPrintf("DEBUG: [%s] Begin upload %s to %s", reqid, hash, sv[next_server])
+					go this.uploadToKeepServer(sv[next_server], hash, getReader(), upload_status, expectedLength, reqid)
 					next_server += 1
 					active += 1
 				} else {
@@ -190,8 +185,8 @@ func (this *KeepClient) putReplicas(
 					}
 				}
 			}
-			DebugPrintf("DEBUG: [%08x] Replicas remaining to write: %v active uploads: %v",
-				requestID, replicasTodo, active)
+			DebugPrintf("DEBUG: [%s] Replicas remaining to write: %v active uploads: %v",
+				reqid, replicasTodo, active)
 
 			// Now wait for something to happen.
 			if active > 0 {