Fix nodemanager test race. No issue #

[arvados.git] / services / keepstore / s3_volume.go

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 572ee46e71419693b103801c7e01a8a139a0c69e..7d9ba8ab9ef33bf46888566c6d0c6ae333dba9ae 100644 (file)
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -39,6 +39,9 @@ type s3VolumeAdder struct {
 }
 
 func (s *s3VolumeAdder) Set(bucketName string) error {
+       if trashLifetime != 0 {
+               return ErrNotImplemented
+       }
        if bucketName == "" {
                return fmt.Errorf("no container name given")
        }
@@ -257,10 +260,13 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error {
        return nil
 }
 
-func (v *S3Volume) Delete(loc string) error {
+func (v *S3Volume) Trash(loc string) error {
        if v.readonly {
                return MethodDisabledError
        }
+       if trashLifetime != 0 {
+               return ErrNotImplemented
+       }
        if t, err := v.Mtime(loc); err != nil {
                return err
        } else if time.Since(t) < blobSignatureTTL {
@@ -272,6 +278,11 @@ func (v *S3Volume) Delete(loc string) error {
        return v.Bucket.Del(loc)
 }
 
+// TBD
+func (v *S3Volume) Untrash(loc string) error {
+       return ErrNotImplemented
+}
+
 func (v *S3Volume) Status() *VolumeStatus {
        return &VolumeStatus{
                DeviceNum: 1,