projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10383: Merge branch 'master' into 10383-arv-put-incremental-upload
[arvados.git]
/
services
/
keepstore
/
pull_worker.go
diff --git
a/services/keepstore/pull_worker.go
b/services/keepstore/pull_worker.go
index 2626d4bf68e1594f394ad4539f0f32a90fe00339..12860bb662d91a1e31191fed2bccace97bc2ac30 100644
(file)
--- a/
services/keepstore/pull_worker.go
+++ b/
services/keepstore/pull_worker.go
@@
-1,8
+1,8
@@
package main
import (
package main
import (
+ "context"
"crypto/rand"
"crypto/rand"
- "errors"
"fmt"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
"io"
"fmt"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
"io"
@@
-57,7
+57,7
@@
func PullItemAndProcess(pullRequest PullRequest, token string, keepClient *keepc
return
}
if reader == nil {
return
}
if reader == nil {
- return
errors.New(fmt.Sprintf("No reader found for : %s", signedLocator)
)
+ return
fmt.Errorf("No reader found for : %s", signedLocator
)
}
defer reader.Close()
}
defer reader.Close()
@@
-67,7
+67,7
@@
func PullItemAndProcess(pullRequest PullRequest, token string, keepClient *keepc
}
if (readContent == nil) || (int64(len(readContent)) != contentLen) {
}
if (readContent == nil) || (int64(len(readContent)) != contentLen) {
- return
errors.New(fmt.Sprintf("Content not found for: %s", signedLocator)
)
+ return
fmt.Errorf("Content not found for: %s", signedLocator
)
}
err = PutContent(readContent, pullRequest.Locator)
}
err = PutContent(readContent, pullRequest.Locator)
@@
-95,6
+95,6
@@
func GenerateRandomAPIToken() string {
// Put block
var PutContent = func(content []byte, locator string) (err error) {
// Put block
var PutContent = func(content []byte, locator string) (err error) {
- _, err = PutBlock(content, locator)
+ _, err = PutBlock(conte
xt.Background(), conte
nt, locator)
return
}
return
}