X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/625076c05698e37beb732850dc01248be9dbe7f6..f9e39b9d8ae46c3e1200e3eddc0bc68ea6ce0925:/services/keepstore/pull_worker.go

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index 670fa1a414..348bfb4df0 100644
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepstore
 
 import (
 	"context"
@@ -50,7 +50,7 @@ func (h *handler) pullItemAndProcess(pullRequest PullRequest) error {
 	// Make a private copy of keepClient so we can set
 	// ServiceRoots to the source servers specified in the pull
 	// request.
-	keepClient := *h.keepClient
+	keepClient := h.keepClient.Clone()
 	serviceRoots := make(map[string]string)
 	for _, addr := range pullRequest.Servers {
 		serviceRoots[addr] = addr
@@ -59,7 +59,7 @@ func (h *handler) pullItemAndProcess(pullRequest PullRequest) error {
 
 	signedLocator := SignLocator(h.Cluster, pullRequest.Locator, keepClient.Arvados.ApiToken, time.Now().Add(time.Minute))
 
-	reader, contentLen, _, err := GetContent(signedLocator, &keepClient)
+	reader, _, _, err := GetContent(signedLocator, keepClient)
 	if err != nil {
 		return err
 	}
@@ -73,7 +73,7 @@ func (h *handler) pullItemAndProcess(pullRequest PullRequest) error {
 		return err
 	}
 
-	if (readContent == nil) || (int64(len(readContent)) != contentLen) {
+	if readContent == nil {
 		return fmt.Errorf("Content not found for: %s", signedLocator)
 	}
 
@@ -89,6 +89,6 @@ var writePulledBlock = func(volmgr *RRVolumeManager, volume Volume, data []byte,
 	if volume != nil {
 		return volume.Put(context.Background(), locator, data)
 	}
-	_, err := PutBlock(context.Background(), volmgr, data, locator)
+	_, err := PutBlock(context.Background(), volmgr, data, locator, nil)
 	return err
 }