projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #3761
[arvados.git]
/
services
/
keepstore
/
pull_worker.go
diff --git
a/services/keepstore/pull_worker.go
b/services/keepstore/pull_worker.go
index 46b933c5e0503824a2d02b4a60d1390cd5515eaa..fac4bb15030eaaa8334bf375dc2a9baa4695fbb0 100644
(file)
--- a/
services/keepstore/pull_worker.go
+++ b/
services/keepstore/pull_worker.go
@@
-23,7
+23,7
@@
func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
nextItem := pullq.NextItem
for item := range nextItem {
pullRequest := item.(PullRequest)
nextItem := pullq.NextItem
for item := range nextItem {
pullRequest := item.(PullRequest)
- err := Pull
(item.(PullRequest
), keepClient)
+ err := Pull
ItemAndProcess(item.(PullRequest), GenerateRandomApiToken(
), keepClient)
if err == nil {
log.Printf("Pull %s success", pullRequest)
} else {
if err == nil {
log.Printf("Pull %s success", pullRequest)
} else {
@@
-39,7
+39,9
@@
func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
Using this token & signature, retrieve the given block.
Write to storage
*/
Using this token & signature, retrieve the given block.
Write to storage
*/
-func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error) {
+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
service_roots := make(map[string]string)
for _, addr := range pullRequest.Servers {
service_roots[addr] = addr
@@
-48,7
+50,7
@@
func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error)
// Generate signature with a random token
expires_at := time.Now().Add(60 * time.Second)
// Generate signature with a random 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(signedLocator, keepClient)
if err != nil {
reader, contentLen, _, err := GetContent(signedLocator, keepClient)
if err != nil {