linux/prox: timeout fifo creation

stevvooe · stevvooe · commit 9754696ff53d · 2018-03-23T14:53:13.000-07:00
Under certain conditions in the client, the fifo for a container may not
be created. A timeout has been added to this operation to ensure the
shim can recover when the client fails to open the fifos.

Signed-off-by: Stephen J Day &lt;stephen.day@docker.com&gt;
diff --git a/linux/proc/exec.go b/linux/proc/exec.go
@@ -163,7 +163,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {
 		return e.parent.runtimeError(err, "OCI runtime exec failed")
 	}
 	if e.stdio.Stdin != "" {
-		sc, err := fifo.OpenFifo(ctx, e.stdio.Stdin, syscall.O_WRONLY|syscall.O_NONBLOCK, 0)
+		fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)
+		defer cancel()
+
+		sc, err := fifo.OpenFifo(fifoCtx, e.stdio.Stdin, syscall.O_WRONLY|syscall.O_NONBLOCK, 0)
 		if err != nil {
 			return errors.Wrapf(err, "failed to open stdin fifo %s", e.stdio.Stdin)
 		}
@@ -180,7 +183,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {
 			return errors.Wrap(err, "failed to start console copy")
 		}
 	} else if !e.stdio.IsNull() {
-		if err := copyPipes(ctx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
+		fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)
+		defer cancel()
+
+		if err := copyPipes(fifoCtx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
 			return errors.Wrap(err, "failed to start io pipe copy")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {`
`163`	`163`	`return e.parent.runtimeError(err, "OCI runtime exec failed")`
`164`	`164`	`}`
`165`	`165`	`if e.stdio.Stdin != "" {`
`166`		`- sc, err := fifo.OpenFifo(ctx, e.stdio.Stdin, syscall.O_WRONLY\|syscall.O_NONBLOCK, 0)`
	`166`	`+ fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)`
	`167`	`+ defer cancel()`
	`168`	`+`
	`169`	`+ sc, err := fifo.OpenFifo(fifoCtx, e.stdio.Stdin, syscall.O_WRONLY\|syscall.O_NONBLOCK, 0)`
`167`	`170`	`if err != nil {`
`168`	`171`	`return errors.Wrapf(err, "failed to open stdin fifo %s", e.stdio.Stdin)`
`169`	`172`	`}`
`@@ -180,7 +183,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {`
`180`	`183`	`return errors.Wrap(err, "failed to start console copy")`
`181`	`184`	`}`
`182`	`185`	`} else if !e.stdio.IsNull() {`
`183`		`- if err := copyPipes(ctx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {`
	`186`	`+ fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)`
	`187`	`+ defer cancel()`
	`188`	`+`
	`189`	`+ if err := copyPipes(fifoCtx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {`
`184`	`190`	`return errors.Wrap(err, "failed to start io pipe copy")`
`185`	`191`	`}`
`186`	`192`	`}`