9437: gofmt

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

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 79a680d58a3efebab11467ca2f3a474d2e0d0feb..98e12034f84922d0c6bb7c94ceeeda68888a9561 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"
@@ -85,7 +86,7 @@ func (s *s3VolumeAdder) Set(bucketName string) error {
 }
 
 func s3regions() (okList []string) {
-       for r, _ := range aws.Regions {
+       for r := range aws.Regions {
                okList = append(okList, r)
        }
        return
@@ -153,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)
        }
 }
 
@@ -250,7 +249,7 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error {
                        if !v.isKeepBlock(key.Key) {
                                continue
                        }
-                       fmt.Fprintf(writer, "%s+%d %d\n", key.Key, key.Size, t.Unix())
+                       fmt.Fprintf(writer, "%s+%d %d\n", key.Key, key.Size, t.UnixNano())
                }
                if !listResp.IsTruncated {
                        break
@@ -312,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