diff --git a/changelogs/fragments/81064-daemonize-fixes.yml b/changelogs/fragments/81064-daemonize-fixes.yml new file mode 100644 index 00000000000..06f2af3d1e6 --- /dev/null +++ b/changelogs/fragments/81064-daemonize-fixes.yml @@ -0,0 +1,2 @@ +bugfixes: + - "``ansible.module_utils.service`` - fix inter-process communication in ``daemonize()``" diff --git a/lib/ansible/module_utils/service.py b/lib/ansible/module_utils/service.py index f48ad290a22..075adfd9e8e 100644 --- a/lib/ansible/module_utils/service.py +++ b/lib/ansible/module_utils/service.py @@ -207,17 +207,19 @@ def daemonize(module, cmd): p = subprocess.Popen(run_cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=lambda: os.close(pipe[1])) fds = [p.stdout, p.stderr] - # loop reading output till its done + # loop reading output till it is done output = {p.stdout: b(""), p.stderr: b("")} while fds: rfd, wfd, efd = select.select(fds, [], fds, 1) - if (rfd + wfd + efd) or p.poll(): + if (rfd + wfd + efd) or p.poll() is None: for out in list(fds): if out in rfd: data = os.read(out.fileno(), chunk) if not data: fds.remove(out) - output[out] += b(data) + output[out] += data + else: + break # even after fds close, we might want to wait for pid to die p.wait() @@ -246,7 +248,7 @@ def daemonize(module, cmd): data = os.read(pipe[0], chunk) if not data: break - return_data += b(data) + return_data += data # Note: no need to specify encoding on py3 as this module sends the # pickle to itself (thus same python interpreter so we aren't mixing