vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #133 from tonistiigi/raise-wait-timeout

Browse source 
Raise pidfile wait timeout
This commit is contained in:
Tõnis Tiigi 2016-03-16 17:59:21 -07:00
commit 797e79774f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/container_linux.go
View file

@ -303,7 +303,7 @@ func (c *container) writeEventFD(root string, cfd, efd int) error {
} }
func waitForStart(p *process, cmd *exec.Cmd) error { func waitForStart(p *process, cmd *exec.Cmd) error {
for i := 0; i < 50; i++ { for i := 0; i < 300; i++ {
if _, err := p.getPidFromFile(); err != nil { if _, err := p.getPidFromFile(); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
alive, err := isAlive(cmd) alive, err := isAlive(cmd)
@ -327,7 +327,7 @@ func waitForStart(p *process, cmd *exec.Cmd) error {
} }
return ErrContainerNotStarted return ErrContainerNotStarted
} }
time.Sleep(100 * time.Millisecond) time.Sleep(50 * time.Millisecond)
continue continue
} }
return err return err