ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-17 12:28:55 +00:00
Code Packages Projects Releases Wiki Activity

Prevent infinite loop. (#922) (#926)

Browse Source 
(cherry picked from commit 6fcbd34e23)
This commit is contained in:
Felix Fontein 2024-07-08 09:27:31 +02:00 committed by GitHub
parent 4d5920967f
commit 02b2070ff3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/922-docker_container-wait-fix.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- "docker_container - fix possible infinite loop if ``removal_wait_timeout`` is set (https://github.com/ansible-collections/community.docker/pull/922)."

2
plugins/modules/docker_container.py
View File

@ -2900,7 +2900,7 @@ class ContainerManager(DockerBaseClass):
self.fail(msg.format(container_id, state)) self.fail(msg.format(container_id, state))
# Wait # Wait
if max_wait is not None: if max_wait is not None:
if total_wait > max_wait: if total_wait > max_wait or delay < 1E-4:
msg = 'Timeout of {1} seconds exceeded while waiting for container "{0}"' msg = 'Timeout of {1} seconds exceeded while waiting for container "{0}"'
self.fail(msg.format(container_id, max_wait)) self.fail(msg.format(container_id, max_wait))
if total_wait + delay > max_wait: if total_wait + delay > max_wait: