octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-26 06:46:34 +00:00
Code Issues Releases Wiki Activity

gs/swift: calculate md5 content hash for upload

Browse Source
This commit is contained in:
Michael Eischer 2020-12-19 12:49:58 +01:00
parent 1d3e99f475
commit a009b39e4c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/backend/gs/gs.go
View File

@ -3,6 +3,7 @@ package gs
import ( import (
"context" "context"
"crypto/md5"
"hash" "hash"
"io" "io"
"net/http" "net/http"
@ -191,7 +192,7 @@ func (be *Backend) Location() string {
// Hasher may return a hash function for calculating a content hash for the backend // Hasher may return a hash function for calculating a content hash for the backend
func (be *Backend) Hasher() hash.Hash { func (be *Backend) Hasher() hash.Hash {
return nil return md5.New()
} }
// Path returns the path in the bucket that is used for this backend. // Path returns the path in the bucket that is used for this backend.
@ -240,6 +241,7 @@ func (be *Backend) Save(ctx context.Context, h restic.Handle, rd restic.RewindRe
// uploads are not providing significant benefit anyways. // uploads are not providing significant benefit anyways.
w := be.bucket.Object(objName).NewWriter(ctx) w := be.bucket.Object(objName).NewWriter(ctx)
w.ChunkSize = 0 w.ChunkSize = 0
w.MD5 = rd.Hash()
wbytes, err := io.Copy(w, rd) wbytes, err := io.Copy(w, rd)
cerr := w.Close() cerr := w.Close()
if err == nil { if err == nil {

6
internal/backend/swift/swift.go
View File

@ -2,6 +2,8 @@ package swift
import ( import (
"context" "context"
"crypto/md5"
"encoding/hex"
"fmt" "fmt"
"hash" "hash"
"io" "io"
@ -118,7 +120,7 @@ func (be *beSwift) Location() string {
// Hasher may return a hash function for calculating a content hash for the backend // Hasher may return a hash function for calculating a content hash for the backend
func (be *beSwift) Hasher() hash.Hash { func (be *beSwift) Hasher() hash.Hash {
return nil return md5.New()
} }
// Load runs fn with a reader that yields the contents of the file at h at the // Load runs fn with a reader that yields the contents of the file at h at the
@ -184,7 +186,7 @@ func (be *beSwift) Save(ctx context.Context, h restic.Handle, rd restic.RewindRe
debug.Log("PutObject(%v, %v, %v)", be.container, objName, encoding) debug.Log("PutObject(%v, %v, %v)", be.container, objName, encoding)
hdr := swift.Headers{"Content-Length": strconv.FormatInt(rd.Length(), 10)} hdr := swift.Headers{"Content-Length": strconv.FormatInt(rd.Length(), 10)}
_, err := be.conn.ObjectPut(be.container, objName, rd, true, "", encoding, hdr) _, err := be.conn.ObjectPut(be.container, objName, rd, true, hex.EncodeToString(rd.Hash()), encoding, hdr)
// swift does not return the upload length // swift does not return the upload length
debug.Log("%v, err %#v", objName, err) debug.Log("%v, err %#v", objName, err)