octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-05 04:47:51 +00:00
Code Issues Releases Wiki Activity

GetPartialObject does not work.

Browse Source
This commit is contained in:
Chris Howey 2015-11-06 17:46:59 -06:00 committed by Alexander Neumann
parent ed2a4ba1d5
commit e2445f4c97
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backend/s3/s3.go
View File

@ -3,6 +3,7 @@ package s3
import ( import (
"bytes" "bytes"
"errors" "errors"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -113,7 +114,7 @@ func (bb *s3Blob) Finalize(t backend.Type, name string) error {
} }
<-bb.b.connChan <-bb.b.connChan
err = bb.b.s3api.PutObject(bb.b.bucketname, path, "application/octet-stream", int64(bb.buf.Len()), bb.buf) err = bb.b.s3api.PutObject(bb.b.bucketname, path, "binary/octet-stream", int64(bb.buf.Len()), bb.buf)
bb.b.connChan <- struct{}{} bb.b.connChan <- struct{}{}
bb.buf.Reset() bb.buf.Reset()
return err return err
@ -134,18 +135,34 @@ func (be *S3Backend) Create() (backend.Blob, error) {
// name. The reader should be closed after draining it. // name. The reader should be closed after draining it.
func (be *S3Backend) Get(t backend.Type, name string) (io.ReadCloser, error) { func (be *S3Backend) Get(t backend.Type, name string) (io.ReadCloser, error) {
path := s3path(t, name) path := s3path(t, name)
r, _, err := be.s3api.GetObject(be.bucketname, path) rc, _, err := be.s3api.GetObject(be.bucketname, path)
rc := ioutil.NopCloser(r)
return rc, err return rc, err
} }
// GetReader returns an io.ReadCloser for the Blob with the given name of // GetReader returns an io.ReadCloser for the Blob with the given name of
// type t at offset and length. If length is 0, the reader reads until EOF. // type t at offset and length. If length is 0, the reader reads until EOF.
func (be *S3Backend) GetReader(t backend.Type, name string, offset, length uint) (io.ReadCloser, error) { func (be *S3Backend) GetReader(t backend.Type, name string, offset, length uint) (io.ReadCloser, error) {
path := s3path(t, name) rc, err := be.Get(t, name)
r, _, err := be.s3api.GetPartialObject(be.bucketname, path, int64(offset), int64(length)) if err != nil {
rc := ioutil.NopCloser(r) return nil, err
return rc, err
}
n, errc := io.CopyN(ioutil.Discard, rc, int64(offset))
if errc != nil {
return nil, errc
} else if n != int64(offset) {
return nil, fmt.Errorf("less bytes read than expected, read: %d, expected: %d", n, offset)
}
if length == 0 {
return rc, nil
}
return backend.LimitReadCloser(rc, int64(length)), nil
} }
// Test returns true if a blob of the given type and name exists in the backend. // Test returns true if a blob of the given type and name exists in the backend.