TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-10-09 15:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

backup/scanner: Fix total size for overlapping targets

Browse Source 
Before, the scanner would could files twice if they were included in the
list of backup targets twice, e.g. `restic backup foo foo/bar` would
could the file `foo/bar` twice.

This commit uses the tree structure from the archiver to run the
scanner, so both parts see the same files.
This commit is contained in:
Alexander Neumann
2021-01-28 21:30:06 +01:00
parent 81211750ba
commit 5c617859ab
2 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/archiver/scanner_test.go
View File

@@ -40,8 +40,7 @@ func TestScanner(t *testing.T) {
filepath.FromSlash("work/subdir/other"): {Files: 5, Bytes: 60},
filepath.FromSlash("work/subdir"): {Files: 5, Dirs: 1, Bytes: 60},
filepath.FromSlash("work"): {Files: 5, Dirs: 2, Bytes: 60},
filepath.FromSlash("."): {Files: 5, Dirs: 3, Bytes: 60},
filepath.FromSlash(""): {Files: 5, Dirs: 3, Bytes: 60},
filepath.FromSlash(""): {Files: 5, Dirs: 2, Bytes: 60},
},
},
{
@@ -72,8 +71,7 @@ func TestScanner(t *testing.T) {
filepath.FromSlash("work/subdir/bar.txt"): {Files: 2, Bytes: 30},
filepath.FromSlash("work/subdir"): {Files: 2, Dirs: 1, Bytes: 30},
filepath.FromSlash("work"): {Files: 2, Dirs: 2, Bytes: 30},
filepath.FromSlash("."): {Files: 2, Dirs: 3, Bytes: 30},
filepath.FromSlash(""): {Files: 2, Dirs: 3, Bytes: 30},
filepath.FromSlash(""): {Files: 2, Dirs: 2, Bytes: 30},
},
},
}
@@ -152,7 +150,7 @@ func TestScannerError(t *testing.T) {
},
},
},
result: ScanStats{Files: 5, Dirs: 3, Bytes: 60},
result: ScanStats{Files: 5, Dirs: 2, Bytes: 60},
},
{
name: "unreadable-dir",
@@ -168,7 +166,7 @@ func TestScannerError(t *testing.T) {
},
},
},
result: ScanStats{Files: 3, Dirs: 2, Bytes: 28},
result: ScanStats{Files: 3, Dirs: 1, Bytes: 28},
prepare: func(t testing.TB) {
err := os.Chmod(filepath.Join("work", "subdir"), 0000)
if err != nil {
@@ -191,7 +189,7 @@ func TestScannerError(t *testing.T) {
"foo": TestFile{Content: "foo"},
"other": TestFile{Content: "other"},
},
result: ScanStats{Files: 3, Dirs: 1, Bytes: 11},
result: ScanStats{Files: 3, Dirs: 0, Bytes: 11},
resFn: func(t testing.TB, item string, s ScanStats) {
if item == "bar" {
err := os.Remove("foo")
@@ -289,7 +287,7 @@ func TestScannerCancel(t *testing.T) {
"other": TestFile{Content: "other"},
}
result := ScanStats{Files: 2, Dirs: 1, Bytes: 6}
result := ScanStats{Files: 2, Dirs: 0, Bytes: 6}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()