Merge branch 'master' into 5145-combine-collections-repeated-filenames

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

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index e102f5a237830a58b488a9e09b65d5a361ccd133..fac4bb15030eaaa8334bf375dc2a9baa4695fbb0 100644 (file)
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -22,7 +22,13 @@ import (
 func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
        nextItem := pullq.NextItem
        for item := range nextItem {
-               Pull(item.(PullRequest), keepClient)
+               pullRequest := item.(PullRequest)
+               err := PullItemAndProcess(item.(PullRequest), GenerateRandomApiToken(), keepClient)
+               if err == nil {
+                       log.Printf("Pull %s success", pullRequest)
+               } else {
+                       log.Printf("Pull %s error: %s", pullRequest, err)
+               }
        }
 }
 
@@ -33,14 +39,8 @@ 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) {
-       defer func() {
-               if err == nil {
-                       log.Printf("Pull %s success", pullRequest)
-               } else {
-                       log.Printf("Pull %s error: %s", pullRequest, err)
-               }
-       }()
+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 {
@@ -50,7 +50,7 @@ func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error)
 
        // 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 {