X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ba032ff921ffb7be57d9f831e2a3dce8b38e266e..59b414ff7a625ad3d6e92659b20bdabc6d89e7d4:/services/keepstore/pull_worker.go

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index db2b54ddc8..acf861119f 100644
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -4,18 +4,13 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 	"io"
 	"io/ioutil"
 	"log"
-	"os"
 	"time"
 )
 
-var arv arvadosclient.ArvadosClient
-var keepClient keepclient.KeepClient
-
 /*
 	Keepstore initiates pull worker channel goroutine.
 	The channel will process pull list.
@@ -24,20 +19,17 @@ var keepClient keepclient.KeepClient
 			Skip the rest of the servers if no errors
 		Repeat
 */
-func RunPullWorker(nextItem <-chan interface{}) {
-	var err error
-	arv, err = arvadosclient.MakeArvadosClient()
-	if err != nil {
-		log.Fatalf("Error setting up arvados client %s", err.Error())
-	}
-
-	keepClient, err = keepclient.MakeKeepClient(&arv)
-	if err != nil {
-		log.Fatalf("Error setting up keep client %s", err.Error())
-	}
-
+func RunPullWorker(pullq *WorkQueue, keepClient *keepclient.KeepClient) {
+	nextItem := pullq.NextItem
 	for item := range nextItem {
-		Pull(item.(PullRequest))
+		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)
+		}
 	}
 }
 
@@ -48,27 +40,20 @@ func RunPullWorker(nextItem <-chan interface{}) {
 		Using this token & signature, retrieve the given block.
 		Write to storage
 */
-func Pull(pullRequest PullRequest) (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
-	PermissionSecret = []byte(os.Getenv("ARVADOS_API_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(pullRequest.Locator, signedLocator)
+	reader, contentLen, _, err := GetContent(signedLocator, keepClient)
 	if err != nil {
 		return
 	}
@@ -91,7 +76,8 @@ func Pull(pullRequest PullRequest) (err error) {
 }
 
 // Fetch the content for the given locator using keepclient.
-var GetContent = func(locator string, signedLocator string) (reader io.ReadCloser, contentLength int64, url string, err error) {
+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
 }