7179: Tighten Put requirements when overwriting existing data.

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

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index db1d756ad8748ea0b365a296e2a0a162fed15747..acf861119f47fd1b765bcad461d826c369151968 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,17 @@ 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))
+               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)
+               }
        }
 }
 
@@ -37,27 +40,20 @@ func RunPullWorker(pullq *WorkQueue, kc keepclient.KeepClient) {
                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
        }
@@ -80,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
 }