projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16526: Merge branch 'master' into 16526-ruby-and-python-build-script-updates
[arvados.git]
/
services
/
keepstore
/
volume.go
diff --git
a/services/keepstore/volume.go
b/services/keepstore/volume.go
index 86143550220cc4d0098533d85a298400ea203118..5a277b6007a7bdb7ff4ed2db04ddcb7b44606e5d 100644
(file)
--- a/
services/keepstore/volume.go
+++ b/
services/keepstore/volume.go
@@
-13,7
+13,7
@@
import (
"sync/atomic"
"time"
"sync/atomic"
"time"
- "git.
curoverse.com
/arvados.git/sdk/go/arvados"
+ "git.
arvados.org
/arvados.git/sdk/go/arvados"
"github.com/sirupsen/logrus"
)
"github.com/sirupsen/logrus"
)
@@
-170,12
+170,12
@@
type Volume interface {
// Trash moves the block data from the underlying storage
// device to trash area. The block then stays in trash for
// Trash moves the block data from the underlying storage
// device to trash area. The block then stays in trash for
- //
-trash-lifetime interval
before it is actually deleted.
+ //
BlobTrashLifetime
before it is actually deleted.
//
// loc is as described in Get.
//
// If the timestamp for the given locator is newer than
//
// loc is as described in Get.
//
// If the timestamp for the given locator is newer than
- // BlobSign
ature
TTL, Trash must not trash the data.
+ // BlobSign
ing
TTL, Trash must not trash the data.
//
// If a Trash operation overlaps with any Touch or Put
// operations on the same locator, the implementation must
//
// If a Trash operation overlaps with any Touch or Put
// operations on the same locator, the implementation must
@@
-196,8
+196,7
@@
type Volume interface {
// reliably or fail outright.
//
// Corollary: A successful Touch or Put guarantees a block
// reliably or fail outright.
//
// Corollary: A successful Touch or Put guarantees a block
- // will not be trashed for at least BlobSignatureTTL
- // seconds.
+ // will not be trashed for at least BlobSigningTTL seconds.
Trash(loc string) error
// Untrash moves block from trash back into store
Trash(loc string) error
// Untrash moves block from trash back into store
@@
-216,8
+215,8
@@
type Volume interface {
// secrets.
String() string
// secrets.
String() string
- // EmptyTrash looks for trashed blocks that exceeded
TrashLifetime
- // and deletes them from the volume.
+ // EmptyTrash looks for trashed blocks that exceeded
+ //
BlobTrashLifetime
and deletes them from the volume.
EmptyTrash()
// Return a globally unique ID of the underlying storage
EmptyTrash()
// Return a globally unique ID of the underlying storage