octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-30 00:33:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1105 from restic/improve-sftp-open

Browse Source 
sftp: Improve check for data subdirs
This commit is contained in:
Alexander Neumann 2017-07-16 15:41:13 +02:00
commit 41b624ea1b
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ Small changes
https://github.com/restic/rest-server/pull/11#issuecomment-309879710 https://github.com/restic/rest-server/pull/11#issuecomment-309879710
https://github.com/restic/restic/issues/1055 https://github.com/restic/restic/issues/1055
https://github.com/restic/restic/pull/1077 https://github.com/restic/restic/pull/1077
https://github.com/restic/restic/pull/1105
* When no S3 credentials are specified in the environment variables, restic * When no S3 credentials are specified in the environment variables, restic
now tries to load credentials from an IAM instance profile when the s3 now tries to load credentials from an IAM instance profile when the s3

54
src/restic/backend/sftp/sftp.go
View File

@ -126,20 +126,56 @@ func Open(cfg Config) (*SFTP, error) {
debug.Log("layout: %v\n", sftp.Layout) debug.Log("layout: %v\n", sftp.Layout)
// create paths for data and refs. mkdirAll does nothing if the paths already exist. if err := sftp.checkDataSubdirs(); err != nil {
for _, d := range sftp.Paths() { debug.Log("checkDataSubdirs returned %v", err)
err = sftp.mkdirAll(d, backend.Modes.Dir)
debug.Log("mkdirAll %v -> %v", d, err)
if err != nil {
return nil, err return nil, err
} }
}
sftp.Config = cfg sftp.Config = cfg
sftp.p = cfg.Path sftp.p = cfg.Path
return sftp, nil return sftp, nil
} }
func (r *SFTP) checkDataSubdirs() error {
datadir := r.Dirname(restic.Handle{Type: restic.DataFile})
// check if all paths for data/ exist
entries, err := r.c.ReadDir(datadir)
if err != nil {
return err
}
subdirs := make(map[string]struct{}, len(entries))
for _, entry := range entries {
subdirs[entry.Name()] = struct{}{}
}
for i := 0; i < 256; i++ {
subdir := fmt.Sprintf("%02x", i)
if _, ok := subdirs[subdir]; !ok {
debug.Log("subdir %v is missing, creating", subdir)
err := r.mkdirAll(path.Join(datadir, subdir), backend.Modes.Dir)
if err != nil {
return err
}
}
}
return nil
}
func (r *SFTP) mkdirAllDataSubdirs() error {
for _, d := range r.Paths() {
err := r.mkdirAll(d, backend.Modes.Dir)
debug.Log("mkdirAll %v -> %v", d, err)
if err != nil {
return err
}
}
return nil
}
// Join combines path components with slashes (according to the sftp spec). // Join combines path components with slashes (according to the sftp spec).
func (r *SFTP) Join(p ...string) string { func (r *SFTP) Join(p ...string) string {
return path.Join(p...) return path.Join(p...)
@ -211,13 +247,9 @@ func Create(cfg Config) (*SFTP, error) {
} }
// create paths for data and refs // create paths for data and refs
for _, d := range sftp.Paths() { if err = sftp.mkdirAllDataSubdirs(); err != nil {
err = sftp.mkdirAll(d, backend.Modes.Dir)
debug.Log("mkdirAll %v -> %v", d, err)
if err != nil {
return nil, err return nil, err
} }
}
err = sftp.Close() err = sftp.Close()
if err != nil { if err != nil {