Prevent infinite loop. (#922)

ansible-collections · Jul 7, 2024 · 6fcbd34 · 6fcbd34
1 parent 7ec56d3
commit 6fcbd34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelogs/fragments/922-docker_container-wait-fix.yml b/changelogs/fragments/922-docker_container-wait-fix.yml
@@ -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)."
diff --git a/plugins/module_utils/module_container/module.py b/plugins/module_utils/module_container/module.py
@@ -247,7 +247,7 @@ def wait_for_state(self, container_id, complete_states=None, wait_states=None, a
                 self.fail(msg.format(container_id, state))
             # Wait
             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}"'
                     self.fail(msg.format(container_id, max_wait))
                 if total_wait + delay > max_wait:
Original file line number	Diff line number	Diff line change
		@@ -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)."