3761: pass keepClient to Pull method

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index db1d756ad8748ea0b365a296e2a0a162fed15747..e102f5a237830a58b488a9e09b65d5a361ccd133 100644 (file)
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -8,12 +8,9 @@ import (
        "io"
        "io/ioutil"
        "log"
-       "os"
        "time"
 )
 
-var keepClient keepclient.KeepClient
-
 /*
        Keepstore initiates pull worker channel goroutine.
        The channel will process pull list.
@@ -22,11 +19,10 @@ var keepClient keepclient.KeepClient
                        Skip the rest of the servers if no errors
                Repeat
 */
-func RunPullWorker(pullq *WorkQueue, kc keepclient.KeepClient) {
+func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
        nextItem := pullq.NextItem
-       keepClient = kc
        for item := range nextItem {
-               Pull(item.(PullRequest))
+               Pull(item.(PullRequest), keepClient)
        }
 }
 
@@ -37,7 +33,7 @@ func RunPullWorker(pullq *WorkQueue, kc keepclient.KeepClient) {
                Using this token & signature, retrieve the given block.
                Write to storage
 */
-func Pull(pullRequest PullRequest) (err error) {
+func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error) {
        defer func() {
                if err == nil {
                        log.Printf("Pull %s success", pullRequest)
@@ -53,11 +49,10 @@ func Pull(pullRequest PullRequest) (err error) {
        keepClient.SetServiceRoots(service_roots)
 
        // 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)
 
-       reader, contentLen, _, err := GetContent(pullRequest.Locator, signedLocator)
+       reader, contentLen, _, err := GetContent(signedLocator, keepClient)
        if err != nil {
                return
        }
@@ -80,7 +75,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
 }

diff --git a/services/keepstore/pull_worker_test.go b/services/keepstore/pull_worker_test.go
index 962f2b1e0a10c1034ff5aad3870fcb3a44300020..2ccb94d2ae537ca7bdd174f2aacfc13a35b71781 100644 (file)
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -233,7 +233,8 @@ func performTest(testData PullWorkerTestData, c *C) {
        time.Sleep(25 * time.Millisecond)
 
        // Override GetContent to mock keepclient Get functionality
-       GetContent = func(locator string, signedLocator string) (reader io.ReadCloser, contentLength int64, url string, err error) {
+       GetContent = func(signedLocator string, keepClient keepclient.KeepClient) (
+               reader io.ReadCloser, contentLength int64, url string, err error) {
                if strings.HasPrefix(testData.name, "TestPullWorker_pull_list_with_one_locator_with_delay") {
                        time.Sleep(100 * time.Millisecond)
                }