alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Properly close the minio object on Stat()

Browse source 
Closes #544
This commit is contained in:
Alexander Neumann 2016-08-21 16:15:24 +02:00
parent 06b23edb39
commit ebd3723a06
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/restic/backend/s3/s3.go
View file

@ -182,15 +182,26 @@ func (be s3) Save(h backend.Handle, p []byte) (err error) {
} }
// Stat returns information about a blob. // Stat returns information about a blob.
func (be s3) Stat(h backend.Handle) (backend.BlobInfo, error) { func (be s3) Stat(h backend.Handle) (bi backend.BlobInfo, err error) {
debug.Log("s3.Stat", "%v", h) debug.Log("s3.Stat", "%v", h)
path := be.s3path(h.Type, h.Name) path := be.s3path(h.Type, h.Name)
obj, err := be.client.GetObject(be.bucketname, path) var obj *minio.Object
obj, err = be.client.GetObject(be.bucketname, path)
if err != nil { if err != nil {
debug.Log("s3.Stat", "GetObject() err %v", err) debug.Log("s3.Stat", "GetObject() err %v", err)
return backend.BlobInfo{}, err return backend.BlobInfo{}, err
} }
// make sure that the object is closed properly.
defer func() {
e := obj.Close()
if err == nil {
err = e
}
}()
fi, err := obj.Stat() fi, err := obj.Stat()
if err != nil { if err != nil {
debug.Log("s3.Stat", "Stat() err %v", err) debug.Log("s3.Stat", "Stat() err %v", err)