github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix duplicate directories entries on metadata change

Browse Source 
Currently directory changes are not added to the list of
included directories, allowing those directories to receive
duplicate entries where there is both a metadata change to the
directory and a change to a file under that directory.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2018-01-24 14:26:14 -08:00
parent 8d32d9edfc
commit dfadd8ce75
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archive/tar.go
View File

@ -583,6 +583,9 @@ func (cw *changeWriter) includeParents(hdr *tar.Header) error {
}
}
}
if hdr.Typeflag == tar.TypeDir {
cw.addedDirs[name] = struct{}{}
}
return nil
}

51
archive/tar_test.go
View File

@ -867,7 +867,7 @@ func TestDiffTar(t *testing.T) {
fileEntry("d2/l1", []byte("link me"), 0644),
// d1/f1 and its parent is included after the new link,
// before the new link was included, these files would
// not habe needed
// not have been needed
dirEntry("d1/", 0755),
linkEntry("d1/f1", "d2/l1"),
dirEntry("d3/", 0755),
@ -898,6 +898,55 @@ func TestDiffTar(t *testing.T) {
fstest.Remove("/d6/l2"),
),
},
{
name: "UpdateDirectoryPermission",
validators: []tarEntryValidator{
dirEntry("d1/", 0777),
dirEntry("d1/d/", 0700),
dirEntry("d2/", 0770),
fileEntry("d2/f", []byte("ok"), 0644),
},
a: fstest.Apply(
fstest.CreateDir("/d1/", 0755),
fstest.CreateDir("/d2/", 0770),
),
b: fstest.Apply(
fstest.Chmod("/d1", 0777),
fstest.CreateDir("/d1/d", 0700),
fstest.CreateFile("/d2/f", []byte("ok"), 0644),
),
},
{
name: "HardlinkUpdatedParent",
validators: []tarEntryValidator{
dirEntry("d1/", 0777),
dirEntry("d2/", 0755),
fileEntry("d2/l1", []byte("link me"), 0644),
// d1/f1 is included after the new link, its
// parent has already changed and therefore
// only the linked file is included
linkEntry("d1/f1", "d2/l1"),
dirEntry("d4/", 0777),
fileEntry("d4/l1", []byte("link me"), 0644),
dirEntry("d3/", 0755),
linkEntry("d3/f1", "d4/l1"),
},
a: fstest.Apply(
fstest.CreateDir("/d1/", 0755),
fstest.CreateFile("/d1/f1", []byte("link me"), 0644),
fstest.CreateDir("/d2/", 0755),
fstest.CreateFile("/d2/f1", []byte("link me"), 0644),
fstest.CreateDir("/d3/", 0755),
fstest.CreateFile("/d3/f1", []byte("link me"), 0644),
fstest.CreateDir("/d4/", 0755),
),
b: fstest.Apply(
fstest.Chmod("/d1", 0777),
fstest.Link("/d1/f1", "/d2/l1"),
fstest.Chmod("/d4", 0777),
fstest.Link("/d3/f1", "/d4/l1"),
),
},
}
for _, at := range tests {