[ServiceBus] Improve test stability and cpu usage (#20352)

* updatet test and improve cpu usage * update changelog
Azure · Aug 30, 2021 · 0320ace · 0320ace
1 parent fac427d
commit 0320ace
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 ### Other Changes
 
+- Reduced CPU load of `azure.servicebus.AutoLockRenewer` during lock renewal.
+
 ## 7.3.2 (2021-08-10)
 
 ### Bugs Fixed

diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_common/auto_lock_renewer.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_common/auto_lock_renewer.py
@@ -176,6 +176,7 @@ def _dispatch_worker(self):
                 self._running_dispatcher.clear()
                 self._last_activity_timestamp = None
                 return
+            time.sleep(self._sleep_time)  # save cpu cycles if there's currently no task in self._renew_tasks
 
     def _auto_lock_renew_task(
         self,

diff --git a/sdk/servicebus/azure-servicebus/tests/mocks.py b/sdk/servicebus/azure-servicebus/tests/mocks.py
@@ -16,8 +16,8 @@ def renew_message_lock(self, message):
 
 
 class MockReceivedMessage(ServiceBusReceivedMessage):
-    def __init__(self, prevent_renew_lock=False, exception_on_renew_lock=False):
-        self._lock_duration = 2
+    def __init__(self, prevent_renew_lock=False, exception_on_renew_lock=False, **kwargs):
+        self._lock_duration = kwargs.get("lock_duration", 2)
         self._raw_amqp_message = None
         self._received_timestamp_utc = utc_now()
         self.locked_until_utc = self._received_timestamp_utc + timedelta(seconds=self._lock_duration)

diff --git a/sdk/servicebus/azure-servicebus/tests/test_queues.py b/sdk/servicebus/azure-servicebus/tests/test_queues.py
@@ -1597,8 +1597,8 @@ def callback_mock(renewable, error):
         auto_lock_renew = AutoLockRenewer()
         auto_lock_renew._renew_period = 1
         with auto_lock_renew: # Check that in normal operation it does not get called
-            auto_lock_renew.register(receiver, renewable=MockReceivedMessage(), on_lock_renew_failure=callback_mock)
-            time.sleep(3)
+            auto_lock_renew.register(receiver, renewable=MockReceivedMessage(lock_duration=5), on_lock_renew_failure=callback_mock)
+            time.sleep(6)
             assert not results
             assert not errors