rdelaage
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191 from restic/fix-189 

Fix restoring symlink timestamps for linux
This commit is contained in:
Alexander Neumann 2015-05-17 14:26:54 +02:00
parent 70f92433c3 14a3ed4e9d
commit cf37b619fd
6 changed files with 170 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
node.go
View File

@ -146,13 +146,11 @@ func (node Node) restoreMetadata(path string) error {
return errors.Annotate(err, "Lchown")
}
if node.Type == "symlink" {
return nil
}
err = os.Chmod(path, node.Mode)
if err != nil {
return errors.Annotate(err, "Chmod")
if node.Type != "symlink" {
err = os.Chmod(path, node.Mode)
if err != nil {
return errors.Annotate(err, "Chmod")
}
}
if node.Type != "dir" {
@ -166,12 +164,20 @@ func (node Node) restoreMetadata(path string) error {
}
func (node Node) RestoreTimestamps(path string) error {
var utimes = []syscall.Timespec{
var utimes = [...]syscall.Timespec{
syscall.NsecToTimespec(node.AccessTime.UnixNano()),
syscall.NsecToTimespec(node.ModTime.UnixNano()),
}
if err := syscall.UtimesNano(path, utimes); err != nil {
if node.Type == "symlink" {
if err := node.restoreSymlinkTimestamps(path, utimes); err != nil {
return err
}
return nil
}
if err := syscall.UtimesNano(path, utimes[:]); err != nil {
return errors.Annotate(err, "UtimesNano")
}

4
node_darwin.go
View File

@ -18,3 +18,7 @@ func (node *Node) fillTimes(stat *syscall.Stat_t) {
node.ChangeTime = time.Unix(stat.Ctimespec.Unix())
node.AccessTime = time.Unix(stat.Atimespec.Unix())
}
func (node Node) restoreSymlinkTimestamps(path string, utimes [2]syscall.Timespec) error {
return nil
}

4
node_freebsd.go
View File

@ -18,3 +18,7 @@ func (node *Node) fillTimes(stat *syscall.Stat_t) {
func changeTime(stat *syscall.Stat_t) time.Time {
return time.Unix(stat.Ctimespec.Unix())
}
func (node Node) restoreSymlinkTimestamps(path string, utimes [2]syscall.Timespec) error {
return nil
}

43
node_linux.go
View File

@ -2,8 +2,12 @@ package restic
import (
"os"
"path/filepath"
"syscall"
"time"
"unsafe"
"github.com/juju/errors"
)
func (node *Node) OpenForReading() (*os.File, error) {
@ -22,3 +26,42 @@ func (node *Node) fillTimes(stat *syscall.Stat_t) {
func changeTime(stat *syscall.Stat_t) time.Time {
return time.Unix(stat.Ctim.Unix())
}
func (node Node) restoreSymlinkTimestamps(path string, utimes [2]syscall.Timespec) error {
dir, err := os.Open(filepath.Dir(path))
defer dir.Close()
if err != nil {
return err
}
err = utimesNanoAt(int(dir.Fd()), filepath.Base(path), utimes, AT_SYMLINK_NOFOLLOW)
if err != nil {
return errors.Annotate(err, "UtimesNanoAt")
}
return nil
}
// very lowlevel below
const AT_SYMLINK_NOFOLLOW = 0x100
func utimensat(dirfd int, path string, times *[2]syscall.Timespec, flags int) (err error) {
var _p0 *byte
_p0, err = syscall.BytePtrFromString(path)
if err != nil {
return
}
_, _, e1 := syscall.Syscall6(syscall.SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
if e1 != 0 {
err = e1
}
return
}
//sys utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
func utimesNanoAt(dirfd int, path string, ts [2]syscall.Timespec, flags int) (err error) {
return utimensat(dirfd, path, (*[2]syscall.Timespec)(unsafe.Pointer(&ts[0])), flags)
}

4
node_openbsd.go
View File

@ -22,3 +22,7 @@ func (node *Node) fillTimes(stat *syscall.Stat_t) {
func changeTime(stat *syscall.Stat_t) time.Time {
return time.Unix(stat.Ctim.Unix())
}
func (node Node) restoreSymlinkTimestamps(path string, utimes [2]syscall.Timespec) error {
return nil
}

104
node_test.go
View File

@ -1,8 +1,15 @@
package restic
package restic_test
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
"time"
"github.com/restic/restic"
"github.com/restic/restic/backend"
. "github.com/restic/restic/test"
)
func BenchmarkNodeFillUser(t *testing.B) {
@ -17,13 +24,12 @@ func BenchmarkNodeFillUser(t *testing.B) {
t.Fatal(err)
}
node := &Node{}
path := tempfile.Name()
t.ResetTimer()
for i := 0; i < t.N; i++ {
node.fillExtra(path, fi)
restic.NodeFromFileInfo(path, fi)
}
}
@ -44,9 +50,99 @@ func BenchmarkNodeFromFileInfo(t *testing.B) {
t.ResetTimer()
for i := 0; i < t.N; i++ {
_, err := NodeFromFileInfo(path, fi)
_, err := restic.NodeFromFileInfo(path, fi)
if err != nil {
t.Fatal(err)
}
}
}
func parseTime(s string) time.Time {
t, err := time.Parse("2006-01-02 15:04:05.999", s)
if err != nil {
panic(err)
}
return t.Local()
}
var nodeTests = []restic.Node{
restic.Node{
Name: "testFile",
Type: "file",
Content: []backend.ID{},
UID: uint32(os.Getuid()),
GID: uint32(os.Getgid()),
Mode: 0604,
ModTime: parseTime("2015-05-14 21:07:23.111"),
AccessTime: parseTime("2015-05-14 21:07:24.222"),
ChangeTime: parseTime("2015-05-14 21:07:25.333"),
},
restic.Node{
Name: "testDir",
Type: "dir",
Subtree: nil,
UID: uint32(os.Getuid()),
GID: uint32(os.Getgid()),
Mode: 020000000750,
ModTime: parseTime("2015-05-14 21:07:23.111"),
AccessTime: parseTime("2015-05-14 21:07:24.222"),
ChangeTime: parseTime("2015-05-14 21:07:25.333"),
},
restic.Node{
Name: "testSymlink",
Type: "symlink",
LinkTarget: "invalid",
UID: uint32(os.Getuid()),
GID: uint32(os.Getgid()),
Mode: 01000000777,
ModTime: parseTime("2015-05-14 21:07:23.111"),
AccessTime: parseTime("2015-05-14 21:07:24.222"),
ChangeTime: parseTime("2015-05-14 21:07:25.333"),
},
}
func TestNodeRestoreAt(t *testing.T) {
tempdir, err := ioutil.TempDir(*TestTempDir, "restic-test-")
OK(t, err)
defer func() {
if *TestCleanup {
OK(t, os.RemoveAll(tempdir))
} else {
t.Logf("leaving tempdir at %v", tempdir)
}
}()
for _, test := range nodeTests {
nodePath := filepath.Join(tempdir, test.Name)
OK(t, test.CreateAt(nodePath, nil))
if test.Type == "dir" {
OK(t, test.RestoreTimestamps(nodePath))
}
fi, err := os.Lstat(nodePath)
OK(t, err)
n2, err := restic.NodeFromFileInfo(nodePath, fi)
OK(t, err)
Assert(t, test.Name == n2.Name,
"%v: name doesn't match", test.Type)
Assert(t, test.Type == n2.Type,
"%v: type doesn't match", test.Type)
Assert(t, test.Size == n2.Size,
"%v: size doesn't match", test.Size)
Assert(t, test.UID == n2.UID,
"%v: UID doesn't match", test.Type)
Assert(t, test.GID == n2.GID,
"%v: GID doesn't match", test.Type)
Assert(t, test.Mode == n2.Mode,
"%v: mode doesn't match", test.Type)
Assert(t, test.ModTime == n2.ModTime,
"%v: ModTime dosn't match", test.Type)
Assert(t, test.AccessTime == n2.AccessTime,
"%v: AccessTime doesn't match", test.Type)
}
}