Merge "Fix spin-lock behavior in _iterate_timeout."

2017-01-21 07:09:03 +00:00 · 2017-01-21 07:09:03 +00:00 · efe7b8d469
parent 6a8bfcafec 362af901d0
commit efe7b8d469
1 changed files with 3 additions and 0 deletions
--- a/shade/_utils.py
+++ b/shade/_utils.py
@ -56,6 +56,9 @@ def _iterate_timeout(timeout, message, wait=2):
        # seems friendlier
        if wait is None:
            wait = 2
+        elif wait == 0:
+            # wait should be < timeout, unless timeout is None
+            wait = 0.1 if timeout is None else min(0.1, timeout)
        wait = float(wait)
    except ValueError:
        raise exc.OpenStackCloudException(