From b4a59f4ee6e3650e8b7bacb0aa492f9cd0491d36 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 28 Dec 2015 13:01:54 +0100 Subject: ipc: increase timeout in tests IPC timeout must be larger than executor timeout. Otherwise IPC kills parent executor but does not kill child executor. --- ipc/ipc.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipc/ipc.go') diff --git a/ipc/ipc.go b/ipc/ipc.go index 7e4ba7ca1..85904d2fa 100644 --- a/ipc/ipc.go +++ b/ipc/ipc.go @@ -46,6 +46,11 @@ const ( ) func MakeEnv(bin string, timeout time.Duration, flags uint64) (*Env, error) { + // IPC timeout must be larger then executor timeout. + // Otherwise IPC will kill parent executor but leave child executor alive. + if timeout < 7*time.Second { + timeout = 7 * time.Second + } inf, inmem, err := createMapping(2 << 20) if err != nil { return nil, err -- cgit mrf-deployment