octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-22 12:55:18 +00:00
Code Issues Releases Wiki Activity

local/sftp: move limiter setup into backend

Browse Source
This commit is contained in:
Michael Eischer 2023-06-08 13:06:25 +02:00
parent 7d12c29286
commit 9aa9e0d1ec
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/restic/global.go
View File

@ -610,11 +610,6 @@ func open(ctx context.Context, s string, gopts GlobalOptions, opts options.Optio
} }
} }
if loc.Scheme == "local" || loc.Scheme == "sftp" {
// wrap the backend in a LimitBackend so that the throughput is limited
be = limiter.LimitBackend(be, lim)
}
// check if config is there // check if config is there
fi, err := be.Stat(ctx, restic.Handle{Type: restic.ConfigFile}) fi, err := be.Stat(ctx, restic.Handle{Type: restic.ConfigFile})
if err != nil { if err != nil {

15
internal/backend/limiter/limiter_backend.go
View File

@ -7,6 +7,21 @@ import (
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
) )
func WrapBackendConstructor[B restic.Backend, C any](constructor func(ctx context.Context, cfg C) (B, error)) func(ctx context.Context, cfg C, lim Limiter) (restic.Backend, error) {
return func(ctx context.Context, cfg C, lim Limiter) (restic.Backend, error) {
var be restic.Backend
be, err := constructor(ctx, cfg)
if err != nil {
return nil, err
}
if lim != nil {
be = LimitBackend(be, lim)
}
return be, nil
}
}
// LimitBackend wraps a Backend and applies rate limiting to Load() and Save() // LimitBackend wraps a Backend and applies rate limiting to Load() and Save()
// calls on the backend. // calls on the backend.
func LimitBackend(be restic.Backend, l Limiter) restic.Backend { func LimitBackend(be restic.Backend, l Limiter) restic.Backend {

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

@ -31,11 +31,7 @@ type Local struct {
var _ restic.Backend = &Local{} var _ restic.Backend = &Local{}
func NewFactory() location.Factory { func NewFactory() location.Factory {
return location.NewLimitedBackendFactory(ParseConfig, location.NoPassword, func(ctx context.Context, cfg Config, _ limiter.Limiter) (*Local, error) { return location.NewLimitedBackendFactory(ParseConfig, location.NoPassword, limiter.WrapBackendConstructor(Create), limiter.WrapBackendConstructor(Open))
return Create(ctx, cfg)
}, func(ctx context.Context, cfg Config, _ limiter.Limiter) (*Local, error) {
return Open(ctx, cfg)
})
} }
const defaultLayout = "default" const defaultLayout = "default"

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

@ -44,11 +44,7 @@ type SFTP struct {
var _ restic.Backend = &SFTP{} var _ restic.Backend = &SFTP{}
func NewFactory() location.Factory { func NewFactory() location.Factory {
return location.NewLimitedBackendFactory(ParseConfig, location.NoPassword, func(ctx context.Context, cfg Config, _ limiter.Limiter) (*SFTP, error) { return location.NewLimitedBackendFactory(ParseConfig, location.NoPassword, limiter.WrapBackendConstructor(Create), limiter.WrapBackendConstructor(Open))
return Create(ctx, cfg)
}, func(ctx context.Context, cfg Config, _ limiter.Limiter) (*SFTP, error) {
return Open(ctx, cfg)
})
} }
const defaultLayout = "default" const defaultLayout = "default"