projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8555: Fix up comments.
[arvados.git]
/
services
/
keepstore
/
s3_volume.go
diff --git
a/services/keepstore/s3_volume.go
b/services/keepstore/s3_volume.go
index da24daf76aacbcd3e49b8afcb1088df44b58d684..1f62f4a173d11bae05d37b3e7994d00877a625b7 100644
(file)
--- a/
services/keepstore/s3_volume.go
+++ b/
services/keepstore/s3_volume.go
@@
-18,8
+18,8
@@
import (
)
var (
)
var (
- //
Returned by Trash if that operation is impossible with the
- // current config.
+ //
ErrS3TrashDisabled is returned by Trash if that operation
+ //
is impossible with the
current config.
ErrS3TrashDisabled = fmt.Errorf("trash function is disabled because -trash-lifetime=0 and -s3-unsafe-delete=false")
s3AccessKeyFile string
ErrS3TrashDisabled = fmt.Errorf("trash function is disabled because -trash-lifetime=0 and -s3-unsafe-delete=false")
s3AccessKeyFile string
@@
-592,7
+592,7
@@
func (v *S3Volume) EmptyTrash() {
continue
}
if trashT.Sub(recentT) < blobSignatureTTL {
continue
}
if trashT.Sub(recentT) < blobSignatureTTL {
- if age := startT.Sub(recentT); age >= blobSignatureTTL
-
v.raceWindow {
+ if age := startT.Sub(recentT); age >= blobSignatureTTL
-
v.raceWindow {
// recent/loc is too old to protect
// loc from being Trashed again during
// the raceWindow that starts if we
// recent/loc is too old to protect
// loc from being Trashed again during
// the raceWindow that starts if we