Don't block on STDIN open
This was found testing other runtime shims that are faster than runc(no containerization). This is a race that can cause the shim to block forever. It's not an issue for out/err because we open both sides of the pipe, but for stdin, it expects the client to have it opened. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
@@ -112,7 +112,7 @@ func copyPipes(ctx context.Context, rio runc.IO, stdin, stdout, stderr string, w
|
||||
rio.Stdin().Close()
|
||||
return nil
|
||||
}
|
||||
f, err := fifo.OpenFifo(ctx, stdin, syscall.O_RDONLY, 0)
|
||||
f, err := fifo.OpenFifo(ctx, stdin, syscall.O_RDONLY|syscall.O_NONBLOCK, 0)
|
||||
if err != nil {
|
||||
return fmt.Errorf("containerd-shim: opening %s failed: %s", stdin, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user