Retry on pidfile read error

tonistiigi · tonistiigi · commit f9ecd09f4f68 · 2016-03-18T09:22:13.000-07:00
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/runtime/container_linux.go b/runtime/container_linux.go
@@ -313,7 +313,7 @@ func (c *container) writeEventFD(root string, cfd, efd int) error {
 func waitForStart(p *process, cmd *exec.Cmd) error {
 	for i := 0; i < 300; i++ {
 		if _, err := p.getPidFromFile(); err != nil {
-			if os.IsNotExist(err) {
+			if os.IsNotExist(err) || err == errInvalidPidInt {
 				alive, err := isAlive(cmd)
 				if err != nil {
 					return err
diff --git a/runtime/process.go b/runtime/process.go
@@ -199,7 +199,7 @@ func (p *process) getPidFromFile() (int, error) {
 	}
 	i, err := strconv.Atoi(string(data))
 	if err != nil {
-		return -1, err
+		return -1, errInvalidPidInt
 	}
 	p.pid = i
 	return i, nil
diff --git a/runtime/runtime.go b/runtime/runtime.go
@@ -19,6 +19,7 @@ var (
 	ErrContainerNotStarted   = errors.New("containerd: container not started")
 
 	errNoPidFile      = errors.New("containerd: no process pid file found")
+	errInvalidPidInt  = errors.New("containerd: process pid is invalid")
 	errNotImplemented = errors.New("containerd: not implemented")
 )
 

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ func (p *process) getPidFromFile() (int, error) {`
`199`	`199`	`}`
`200`	`200`	`i, err := strconv.Atoi(string(data))`
`201`	`201`	`if err != nil {`
`202`		`- return -1, err`
	`202`	`+ return -1, errInvalidPidInt`
`203`	`203`	`}`
`204`	`204`	`p.pid = i`
`205`	`205`	`return i, nil`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ var (`
`19`	`19`	`ErrContainerNotStarted = errors.New("containerd: container not started")`
`20`	`20`
`21`	`21`	`errNoPidFile = errors.New("containerd: no process pid file found")`
	`22`	`+ errInvalidPidInt = errors.New("containerd: process pid is invalid")`
`22`	`23`	`errNotImplemented = errors.New("containerd: not implemented")`
`23`	`24`	`)`
`24`	`25`