diff options
| author | Amitay Isaacs <amitay@samba.org> | 2019-04-09 14:44:04 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-04-15 12:55:46 +0000 |
| commit | 945a41d38415ca273fb62f0dc3cea66d1fa29991 (patch) | |
| tree | b5aea8ebbef920a70f8fdc21280e1658125054a5 /ctdb | |
| parent | d9c47cb86e0a3200cb8de9581596a24fbeb5b3e1 (diff) | |
| download | samba-945a41d38415ca273fb62f0dc3cea66d1fa29991.tar.gz | |
ctdb-common: Avoid race between fd and signal events
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13895
In run_proc, there was an implicit assumption that when a process exits,
fd event (pipe between parent and child) would be processed first and
signal event (SIGCHLD for the child) would be processed later.
However, that is not the case. SIGCHLD can be received asynchronously
any time even when the pipe data has not fully been read. This causes
run_proc to miss some of the output from child process in tests.
When SIGCHLD is being processed, if the pipe between parent and child is
still open, then do an explict read from the pipe to ensure we read any
data still in the pipe before closing the pipe.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Apr 12 08:19:29 UTC 2019 on sn-devel-144
(cherry picked from commit 289201277cd983b27cdfd5376c607eab112b4082)
Autobuild-User(v4-9-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-9-test): Mon Apr 15 12:55:46 UTC 2019 on sn-devel-144
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/common/run_proc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ctdb/common/run_proc.c b/ctdb/common/run_proc.c index 97895b383b9..037b6d9651d 100644 --- a/ctdb/common/run_proc.c +++ b/ctdb/common/run_proc.c @@ -295,6 +295,13 @@ again: proc->result.sig = WTERMSIG(status); } + /* Confirm that all data has been read from the pipe */ + if (proc->fd != -1) { + proc_read_handler(ev, proc->fde, 0, proc); + TALLOC_FREE(proc->fde); + proc->fd = -1; + } + /* Active run_proc request */ if (proc->req != NULL) { run_proc_done(proc->req); |