Merge pull request #2224 from dmcgowan/backport-archive-gc-fixes

stevvooe · web-flow · commit a609ec4695b9 · 2018-03-23T09:45:42.000-07:00
[release/1.0] socket in archive and gc config fixes
diff --git a/archive/tar.go b/archive/tar.go
@@ -345,7 +345,10 @@ func (cw *changeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e
 			source = filepath.Join(cw.source, p)
 		)
 
-		if f.Mode()&os.ModeSymlink != 0 {
+		switch {
+		case f.Mode()&os.ModeSocket != 0:
+			return nil // ignore sockets
+		case f.Mode()&os.ModeSymlink != 0:
 			if link, err = os.Readlink(source); err != nil {
 				return err
 			}
diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -1006,6 +1006,22 @@ func TestDiffTar(t *testing.T) {
 				fstest.CreateDir("/d3/", 0755),
 			),
 		},
+		{
+			name: "IgnoreSockets",
+			validators: []tarEntryValidator{
+				fileEntry("f2", []byte("content"), 0644),
+				// There should be _no_ socket here, despite the fstest.CreateSocket below
+				fileEntry("f3", []byte("content"), 0644),
+			},
+			a: fstest.Apply(
+				fstest.CreateFile("/f1", []byte("content"), 0644),
+			),
+			b: fstest.Apply(
+				fstest.CreateFile("/f2", []byte("content"), 0644),
+				fstest.CreateSocket("/s0", 0644),
+				fstest.CreateFile("/f3", []byte("content"), 0644),
+			),
+		},
 	}
 
 	for _, at := range tests {
diff --git a/fs/fstest/file.go b/fs/fstest/file.go
@@ -2,6 +2,7 @@ package fstest
 
 import (
 	"io/ioutil"
+	"net"
 	"os"
 	"path/filepath"
 	"time"
@@ -107,6 +108,19 @@ func Link(oldname, newname string) Applier {
 //	}
 //}
 
+// CreateSocket returns a file applier which creates a unix socket
+func CreateSocket(name string, perm os.FileMode) Applier {
+	return applyFn(func(root string) error {
+		fullPath := filepath.Join(root, name)
+		ln, err := net.Listen("unix", fullPath)
+		if err != nil {
+			return err
+		}
+		defer ln.Close()
+		return os.Chmod(fullPath, perm)
+	})
+}
+
 // Apply returns a new applier from the given appliers
 func Apply(appliers ...Applier) Applier {
 	return applyFn(func(root string) error {
diff --git a/fs/fstest/testsuite.go b/fs/fstest/testsuite.go
@@ -74,6 +74,7 @@ var (
 		Symlink("libnothing.so", "/usr/local/lib/libnothing.so.2"),
 		CreateDir("/home", 0755),
 		CreateDir("/home/derek", 0700),
+		CreateDir("/var/run/socket", 0700),
 	)
 
 	// basicTest covers basic operations
diff --git a/gc/scheduler/scheduler.go b/gc/scheduler/scheduler.go
@@ -75,6 +75,10 @@ func (d *duration) UnmarshalText(text []byte) error {
 	return nil
 }
 
+func (d duration) MarshalText() (text []byte, err error) {
+	return []byte(time.Duration(d).String()), nil
+}
+
 func init() {
 	plugin.Register(&plugin.Registration{
 		Type: plugin.GCPlugin,

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,10 @@ func (cw *changeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e`
`345`	`345`	`source = filepath.Join(cw.source, p)`
`346`	`346`	`)`
`347`	`347`
`348`		`- if f.Mode()&os.ModeSymlink != 0 {`
	`348`	`+ switch {`
	`349`	`+ case f.Mode()&os.ModeSocket != 0:`
	`350`	`+ return nil // ignore sockets`
	`351`	`+ case f.Mode()&os.ModeSymlink != 0:`
`349`	`352`	`if link, err = os.Readlink(source); err != nil {`
`350`	`353`	`return err`
`351`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ var (`
`74`	`74`	`Symlink("libnothing.so", "/usr/local/lib/libnothing.so.2"),`
`75`	`75`	`CreateDir("/home", 0755),`
`76`	`76`	`CreateDir("/home/derek", 0700),`
	`77`	`+ CreateDir("/var/run/socket", 0700),`
`77`	`78`	`)`
`78`	`79`
`79`	`80`	`// basicTest covers basic operations`