Merge branch 'master' into 8650-container-work-unit

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

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 572ee46e71419693b103801c7e01a8a139a0c69e..80a7c89f2ed4f6669566711c40c4d0a59940e439 100644 (file)
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -10,6 +10,7 @@ import (
        "net/http"
        "os"
        "regexp"
+       "strings"
        "time"
 
        "github.com/AdRoll/goamz/aws"
@@ -39,6 +40,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")
        }
@@ -150,20 +154,18 @@ func (v *S3Volume) Check() error {
        return nil
 }
 
-func (v *S3Volume) Get(loc string) ([]byte, error) {
+func (v *S3Volume) Get(loc string, buf []byte) (int, error) {
        rdr, err := v.Bucket.GetReader(loc)
        if err != nil {
-               return nil, v.translateError(err)
+               return 0, v.translateError(err)
        }
        defer rdr.Close()
-       buf := bufs.Get(BlockSize)
        n, err := io.ReadFull(rdr, buf)
        switch err {
        case nil, io.EOF, io.ErrUnexpectedEOF:
-               return buf[:n], nil
+               return n, nil
        default:
-               bufs.Put(buf)
-               return nil, v.translateError(err)
+               return 0, v.translateError(err)
        }
 }
 
@@ -257,10 +259,14 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error {
        return nil
 }
 
-func (v *S3Volume) Delete(loc string) error {
+// Trash a Keep block.
+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,
@@ -300,7 +311,8 @@ func (v *S3Volume) isKeepBlock(s string) bool {
 func (v *S3Volume) translateError(err error) error {
        switch err := err.(type) {
        case *s3.Error:
-               if err.StatusCode == http.StatusNotFound && err.Code == "NoSuchKey" {
+               if (err.StatusCode == http.StatusNotFound && err.Code == "NoSuchKey") ||
+                       strings.Contains(err.Error(), "Not Found") {
                        return os.ErrNotExist
                }
                // Other 404 errors like NoSuchVersion and
@@ -310,3 +322,9 @@ func (v *S3Volume) translateError(err error) error {
        }
        return err
 }
+
+// EmptyTrash looks for trashed blocks that exceeded trashLifetime
+// and deletes them from the volume.
+// TBD
+func (v *S3Volume) EmptyTrash() {
+}