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

latest docker-py bugfix (npipe) (#513)

Browse Source 
* socket: handle npipe close on Windows (https://github.com/docker/docker-py/pull/3056)

Fixes https://github.com/docker/docker-py/issues/3045

Cherry-picked from https://github.com/docker/docker-py/commit/30022984f6445fbc322cbe97bb99aab1ddb1e4fd

Co-authored-by: Nick Santos <nick.santos@docker.com>

* Add changelog fragment.

Co-authored-by: Nick Santos <nick.santos@docker.com>
This commit is contained in:
Felix Fontein
2022-12-01 06:59:05 +01:00
committed by GitHub
parent a239c0b2db
commit 2957138153
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/fragments/513-api-npipe.yml
+2
View File
@@ -0,0 +1,2 @@
bugfixes:
- "vendored latest Docker SDK for Python bugfix (https://github.com/ansible-collections/community.docker/pull/513, https://github.com/docker/docker-py/issues/3045)."
plugins/module_utils/_api/utils/socket.py
+14
View File
@@ -29,6 +29,11 @@ class SocketError(Exception):
pass pass
# NpipeSockets have their own error types
# pywintypes.error: (109, 'ReadFile', 'The pipe has been ended.')
NPIPE_ENDED = 109
def read(socket, n=4096): def read(socket, n=4096):
""" """
Reads at most n bytes from socket Reads at most n bytes from socket
@@ -48,6 +53,15 @@ def read(socket, n=4096):
except EnvironmentError as e: except EnvironmentError as e:
if e.errno not in recoverable_errors: if e.errno not in recoverable_errors:
raise raise
except Exception as e:
is_pipe_ended = (isinstance(socket, NpipeSocket) and
len(e.args) > 0 and
e.args[0] == NPIPE_ENDED)
if is_pipe_ended:
# npipes don't support duplex sockets, so we interpret
# a PIPE_ENDED error as a close operation (0-length read).
return 0
raise
def read_exactly(socket, n): def read_exactly(socket, n):