moved some logging messages around, added random delay

Author: allmightyspiff

SoftLayer/managers/vs.py

@@ -8,6 +8,7 @@
 import datetime
 import itertools
 import logging
+import random
 import socket
 import time
 import warnings
@@ -406,8 +407,7 @@ def wait_for_transaction(self, instance_id, limit, delay=10):
         :param int delay: The number of seconds to sleep before checks. Defaults to 10.
         """
 
-        return self.wait_for_ready(instance_id, limit, delay=delay,
-                                   pending=True)
+        return self.wait_for_ready(instance_id, limit, delay=delay, pending=True)
 
     def wait_for_ready(self, instance_id, limit, delay=10, pending=False):
         """Determine if a VS is ready and available.
@@ -457,14 +457,15 @@ def wait_for_ready(self, instance_id, limit, delay=10, pending=False):
                         not reloading,
                         not outstanding]):
                     return True
+                LOGGER.info("%s not ready.", str(instance_id))
             except exceptions.SoftLayerAPIError as exception:
-                delay = delay * 2
+                delay = (delay * 2) + random.randint(0, 9)
                 LOGGER.info('Exception: %s', str(exception))
-                LOGGER.info('Auto retry in %s seconds', str(delay))
 
             now = time.time()
             if now >= until:
                 return False
+            LOGGER.info('Auto retry in %s seconds', str(min(delay, until - now)))
             time.sleep(min(delay, until - now))
 
     def verify_create_instance(self, **kwargs):

tests/managers/vs_tests.py

@@ -885,13 +885,15 @@ def test_iter_20_incomplete(self, _sleep, _time):
         _sleep.assert_has_calls([mock.call(10)])
 
     @mock.patch('SoftLayer.managers.vs.VSManager.get_instance')
+    @mock.patch('random.randint')
     @mock.patch('time.time')
     @mock.patch('time.sleep')
-    def test_exception_from_api(self, _sleep, _time, vs):
+    def test_exception_from_api(self, _sleep, _time, _random, vs):
         """Tests escalating scale back when an excaption is thrown"""
         self.guestObject.return_value = {'activeTransaction': {'id': 1}}
         vs.side_effect = exceptions.TransportError(104, "Its broken")
         _time.side_effect = [0, 0, 2, 6, 14, 20, 100]
+        _random.side_effect = [0, 0, 0, 0, 0]
         value = self.vs.wait_for_ready(1, 20, delay=1)
         _sleep.assert_has_calls([
             mock.call(2),