X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a69c06d2d7af4c328f779fd3f213f2018675962c..20abe07b6780abb3a67292af4f4f8ffab988f9ca:/services/keepstore/pull_worker.go

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index e102f5a237..acf861119f 100644
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -19,10 +19,17 @@ 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 {
-		Pull(item.(PullRequest), keepClient)
+		pullRequest := item.(PullRequest)
+		err := PullItemAndProcess(item.(PullRequest), GenerateRandomApiToken(), keepClient)
+		pullq.DoneItem <- struct{}{}
+		if err == nil {
+			log.Printf("Pull %s success", pullRequest)
+		} else {
+			log.Printf("Pull %s error: %s", pullRequest, err)
+		}
 	}
 }
 
@@ -33,24 +40,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) {
-	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 {
 		service_roots[addr] = addr
 	}
-	keepClient.SetServiceRoots(service_roots)
+	keepClient.SetServiceRoots(service_roots, nil, 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 {
@@ -75,7 +76,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