closes #5720

[arvados.git] / services / keepstore / pull_worker.go

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index 46b933c5e0503824a2d02b4a60d1390cd5515eaa..d85458a325a1c44e2e53d177da6bd12f8adbe07b 100644 (file)
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -19,11 +19,11 @@ import (
                        Skip the rest of the servers if no errors
                Repeat
 */
-func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
+func RunPullWorker(pullq *WorkQueue, keepClient *keepclient.KeepClient) {
        nextItem := pullq.NextItem
        for item := range nextItem {
                pullRequest := item.(PullRequest)
-               err := Pull(item.(PullRequest), keepClient)
+               err := PullItemAndProcess(item.(PullRequest), GenerateRandomApiToken(), keepClient)
                if err == nil {
                        log.Printf("Pull %s success", pullRequest)
                } else {
@@ -39,16 +39,18 @@ func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
                Using this token & signature, retrieve the given block.
                Write to storage
 */
-func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error) {
+func PullItemAndProcess(pullRequest PullRequest, token string, keepClient *keepclient.KeepClient) (err error) {
+       keepClient.Arvados.ApiToken = token
+
        service_roots := make(map[string]string)
        for _, addr := range pullRequest.Servers {
                service_roots[addr] = addr
        }
-       keepClient.SetServiceRoots(service_roots)
+       keepClient.SetServiceRoots(service_roots, nil)
 
        // Generate signature with a random token
        expires_at := time.Now().Add(60 * time.Second)
-       signedLocator := SignLocator(pullRequest.Locator, GenerateRandomApiToken(), expires_at)
+       signedLocator := SignLocator(pullRequest.Locator, token, expires_at)
 
        reader, contentLen, _, err := GetContent(signedLocator, keepClient)
        if err != nil {
@@ -73,7 +75,7 @@ func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error)
 }
 
 // Fetch the content for the given locator using keepclient.
-var GetContent = func(signedLocator string, keepClient keepclient.KeepClient) (
+var GetContent = func(signedLocator string, keepClient *keepclient.KeepClient) (
        reader io.ReadCloser, contentLength int64, url string, err error) {
        reader, blocklen, url, err := keepClient.Get(signedLocator)
        return reader, blocklen, url, err