9700: Remove "trashLifetime != 0 is not supported in S3" check, now that it is supported.

refs #9700

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 00f7b3ce150e2171365644ebc9ea34c2921d0aa9..48b83de4b8aa2a40e62be953e236162d396ddae0 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -223,7 +223,7 @@ func main() {
        flag.DurationVar(
                &trashLifetime,
                "trash-lifetime",
-               0*time.Second,
+               0,
                "Time duration after a block is trashed during which it can be recovered using an /untrash request")
        flag.DurationVar(
                &trashCheckInterval,

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 1f62f4a173d11bae05d37b3e7994d00877a625b7..1a2a47b0df3b27d9c38ae7f4c8986a0f48f933a2 100644 (file)
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -43,9 +43,6 @@ type s3VolumeAdder struct {
 }
 
 func (s *s3VolumeAdder) Set(bucketName string) error {
-       if trashLifetime != 0 {
-               return ErrNotImplemented
-       }
        if bucketName == "" {
                return fmt.Errorf("no container name given")
        }