ctr: update WritePidFile to use atomicfile

samuelkarp · thaJeztah · commit d75bf78c2f4a · 2023-07-14T13:42:49.000+02:00
Signed-off-by: Samuel Karp <samuelkarp@google.com> (cherry picked from commit ab53652) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/cmd/ctr/commands/commands.go b/cmd/ctr/commands/commands.go
@@ -24,6 +24,8 @@ import (
 	"strings"
 
 	"github.com/containerd/containerd/defaults"
+	"github.com/containerd/containerd/pkg/atomicfile"
+
 	"github.com/urfave/cli"
 )
 
@@ -259,15 +261,14 @@ func WritePidFile(path string, pid int) error {
 	if err != nil {
 		return err
 	}
-	tempPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".%s", filepath.Base(path)))
-	f, err := os.OpenFile(tempPath, os.O_RDWR|os.O_CREATE|os.O_EXCL|os.O_SYNC, 0666)
+	f, err := atomicfile.New(path, 0o666)
 	if err != nil {
 		return err
 	}
 	_, err = fmt.Fprintf(f, "%d", pid)
-	f.Close()
 	if err != nil {
+		f.Cancel()
 		return err
 	}
-	return os.Rename(tempPath, path)
+	return f.Close()
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`
`26`	`26`	`"github.com/containerd/containerd/defaults"`
	`27`	`+ "github.com/containerd/containerd/pkg/atomicfile"`
	`28`	`+`
`27`	`29`	`"github.com/urfave/cli"`
`28`	`30`	`)`
`29`	`31`
`@@ -259,15 +261,14 @@ func WritePidFile(path string, pid int) error {`
`259`	`261`	`if err != nil {`
`260`	`262`	`return err`
`261`	`263`	`}`
`262`		`- tempPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".%s", filepath.Base(path)))`
`263`		`- f, err := os.OpenFile(tempPath, os.O_RDWR\|os.O_CREATE\|os.O_EXCL\|os.O_SYNC, 0666)`
	`264`	`+ f, err := atomicfile.New(path, 0o666)`
`264`	`265`	`if err != nil {`
`265`	`266`	`return err`
`266`	`267`	`}`
`267`	`268`	`_, err = fmt.Fprintf(f, "%d", pid)`
`268`		`- f.Close()`
`269`	`269`	`if err != nil {`
	`270`	`+ f.Cancel()`
`270`	`271`	`return err`
`271`	`272`	`}`
`272`		`- return os.Rename(tempPath, path)`
	`273`	`+ return f.Close()`
`273`	`274`	`}`