ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-30 20:23:49 +00:00
Code Packages Projects Releases Wiki Activity

Avoid losing data from events if multiple arrive at the same time. (#1158)

Browse Source
This commit is contained in:
Felix Fontein
2025-10-10 20:21:21 +02:00
committed by GitHub
parent e8ec22d3b1
commit f7e976f3da
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/fragments/1158-select-fix.yml
+3
View File
@@ -0,0 +1,3 @@
bugfixes:
- "docker, nsenter connection plugins - fix handling of ``become`` plugin password prompt handling in case multiple events arrive at the same time
(https://github.com/ansible-collections/community.docker/pull/1158)."
plugins/connection/docker.py
+7 -4
View File
@@ -425,21 +425,24 @@ class Connection(ConnectionBase):
+ to_native(become_output) + to_native(become_output)
) )
chunk = None chunks = b""
for key, event in events: for key, event in events:
if key.fileobj == p.stdout: if key.fileobj == p.stdout:
chunk = p.stdout.read() chunk = p.stdout.read()
if chunk:
chunks += chunk
elif key.fileobj == p.stderr: elif key.fileobj == p.stderr:
chunk = p.stderr.read() chunk = p.stderr.read()
# TODO: avoid chunk being set multiple times! if chunk:
chunks += chunk
if not chunk: if not chunks:
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
raise AnsibleError( raise AnsibleError(
"privilege output closed while waiting for password prompt:\n" "privilege output closed while waiting for password prompt:\n"
+ to_native(become_output) + to_native(become_output)
) )
become_output += chunk become_output += chunks
finally: finally:
selector.close() selector.close()
plugins/connection/nsenter.py
+7 -4
View File
@@ -177,21 +177,24 @@ class Connection(ConnectionBase):
+ to_native(become_output) + to_native(become_output)
) )
chunk = None chunks = b""
for key, event in events: for key, event in events:
if key.fileobj == p.stdout: if key.fileobj == p.stdout:
chunk = p.stdout.read() chunk = p.stdout.read()
if chunk:
chunks += chunk
elif key.fileobj == p.stderr: elif key.fileobj == p.stderr:
chunk = p.stderr.read() chunk = p.stderr.read()
# TODO: avoid chunk being set multiple times! if chunk:
chunks += chunk
if not chunk: if not chunks:
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
raise AnsibleError( raise AnsibleError(
"privilege output closed while waiting for password prompt:\n" "privilege output closed while waiting for password prompt:\n"
+ to_native(become_output) + to_native(become_output)
) )
become_output += chunk become_output += chunks
finally: finally:
selector.close() selector.close()