mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

azure: explicitly pass upload size 

Previously the fallback from the azure library was to read the whole
blob into memory and use that to determine the upload size.
This commit is contained in:
Michael Eischer 2020-12-18 23:36:45 +01:00 committed by Alexander Neumann
parent 43cb26010a
commit dca9b6f5db
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/backend/azure/azure.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"encoding/base64" "encoding/base64"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -118,6 +117,16 @@ func (be *Backend) Path() string {
return be.prefix return be.prefix
} }
type azureAdapter struct {
restic.RewindReader
}
func (azureAdapter) Close() error { return nil }
func (a *azureAdapter) Len() int {
return int(a.Length())
}
// Save stores data in the backend at the handle. // Save stores data in the backend at the handle.
func (be *Backend) Save(ctx context.Context, h restic.Handle, rd restic.RewindReader) error { func (be *Backend) Save(ctx context.Context, h restic.Handle, rd restic.RewindReader) error {
if err := h.Valid(); err != nil { if err := h.Valid(); err != nil {
@ -135,7 +144,8 @@ func (be *Backend) Save(ctx context.Context, h restic.Handle, rd restic.RewindRe
var err error var err error
if rd.Length() < 256*1024*1024 { if rd.Length() < 256*1024*1024 {
// wrap the reader so that net/http client cannot close the reader // wrap the reader so that net/http client cannot close the reader
dataReader := ioutil.NopCloser(rd) // CreateBlockBlobFromReader reads length from `Len()``
dataReader := azureAdapter{rd}
// if it's smaller than 256miB, then just create the file directly from the reader // if it's smaller than 256miB, then just create the file directly from the reader
err = be.container.GetBlobReference(objName).CreateBlockBlobFromReader(dataReader, nil) err = be.container.GetBlobReference(objName).CreateBlockBlobFromReader(dataReader, nil)