X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/178a1c6d587f4e5edf1be08261e00af90169c702..2d046e6afeb13988d1438a05301d60a5d399a371:/services/keepstore/pull_worker.go diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go index abe3dc3857..348bfb4df0 100644 --- a/services/keepstore/pull_worker.go +++ b/services/keepstore/pull_worker.go @@ -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) }