0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkg/pidfile: Write(): take pid as argument

Browse source 
This allows it to be used for processes other than the daemon itself.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-10-15 16:52:30 +02:00
parent 735e250326
commit 81945da0ac
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/dockerd/daemon.go
View file

@ -139,7 +139,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
potentiallyUnderRuntimeDir := []string{cli.Config.ExecRoot}
if cli.Pidfile != "" {
if err := pidfile.Write(cli.Pidfile); err != nil {
if err = pidfile.Write(cli.Pidfile, os.Getpid()); err != nil {
return errors.Wrap(err, "failed to start daemon")
}
potentiallyUnderRuntimeDir = append(potentiallyUnderRuntimeDir, cli.Pidfile)

9
pkg/pidfile/pidfile.go
View file

@ -32,12 +32,17 @@ func checkPIDFileAlreadyExists(path string) error {
// Write writes a "PID file" at the specified path. It returns an error if the
// file exists and contains a valid PID of a running process, or when failing
// to write the file.
func Write(path string) error {
func Write(path string, pid int) error {
if pid < 1 {
// We might be running as PID 1 when running docker-in-docker,
// but 0 or negative PIDs are not acceptable.
return fmt.Errorf("invalid PID (%d): only positive PIDs are allowed", pid)
}
if err := checkPIDFileAlreadyExists(path); err != nil {
return err
}
if err := system.MkdirAll(filepath.Dir(path), 0o755); err != nil {
return err
}
return os.WriteFile(path, []byte(strconv.Itoa(os.Getpid())), 0o644)
return os.WriteFile(path, []byte(strconv.Itoa(pid)), 0o644)
}

11
pkg/pidfile/pidfile_test.go
View file

@ -1,18 +1,25 @@
package pidfile // import "github.com/docker/docker/pkg/pidfile"
import (
"os"
"path/filepath"
"testing"
)
func TestWrite(t *testing.T) {
path := filepath.Join(t.TempDir(), "testfile")
err := Write(path)
err := Write(path, 0)
if err == nil {
t.Fatal("writing PID < 1 should fail")
}
err = Write(path, os.Getpid())
if err != nil {
t.Fatal("Could not create test file", err)
}
err = Write(path)
err = Write(path, os.Getpid())
if err == nil {
t.Fatal("Test file creation not blocked")
}