KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Fix crash at restoring pre-existing hardlinked files

Browse source 
Remove target file, ignore non existing file errors.

Small memory saving: Only keep inodes around for files with a link count > 1.
(We will/can never be asked to restore a hardlinked file with one of the
files having a link count of 1.)

Closes #836
This commit is contained in:
Pauline Middelink 2017-03-10 23:57:37 +01:00
parent 8958efba60
commit b56e16acd0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/restic/node.go
View file

@ -227,6 +227,9 @@ func (node Node) createDirAt(path string) error {
func (node Node) createFileAt(path string, repo Repository, idx *HardlinkIndex) error { func (node Node) createFileAt(path string, repo Repository, idx *HardlinkIndex) error {
if node.Links > 1 && idx.Has(node.Inode, node.Device) { if node.Links > 1 && idx.Has(node.Inode, node.Device) {
if err := fs.Remove(path); !os.IsNotExist(err) {
return errors.Wrap(err, "RemoveCreateHardlink")
}
err := fs.Link(idx.GetFilename(node.Inode, node.Device), path) err := fs.Link(idx.GetFilename(node.Inode, node.Device), path)
if err != nil { if err != nil {
return errors.Wrap(err, "CreateHardlink") return errors.Wrap(err, "CreateHardlink")
@ -265,7 +268,9 @@ func (node Node) createFileAt(path string, repo Repository, idx *HardlinkIndex)
} }
} }
if node.Links > 1 {
idx.Add(node.Inode, node.Device, path) idx.Add(node.Inode, node.Device, path)
}
return nil return nil
} }