[ServiceBus] retry amqp exception if not non-retry condition (Azure#23980)

* make amqp condition exceptions retryable unless o/w specified

* changelog

* retry if not non-retry condition

* update changelog

* update verson

* add error test

* nit

Author: swathipil

sdk/servicebus/azure-servicebus/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+## 7.6.2 (Unreleased)
+
+### Bugs Fixed
+
+- Fixed bug to make AMQP exceptions retryable by default, if condition is not non-retryable, to ensure that InternalServerErrors are retried.
+
 ## 7.6.1 (2022-04-11)
 
 ### Other Changes

sdk/servicebus/azure-servicebus/azure/servicebus/_version.py

@@ -3,4 +3,4 @@
 # Licensed under the MIT License.
 # ------------------------------------
 
-VERSION = "7.6.1"
+VERSION = "7.6.2"

sdk/servicebus/azure-servicebus/azure/servicebus/exceptions.py

@@ -115,6 +115,8 @@ def _handle_amqp_exception_with_condition(
     )
     if condition in _NO_RETRY_CONDITION_ERROR_CODES:
         error._retryable = False  # pylint: disable=protected-access
+    else:
+        error._retryable = True # pylint: disable=protected-access
 
     return error
 

sdk/servicebus/azure-servicebus/tests/livetest/test_errors.py

@@ -31,3 +31,14 @@ def test_unknown_connection_error():
     assert isinstance(sb_error,ServiceBusError)
     assert not sb_error._retryable
     assert sb_error._shutdown_handler
+
+def test_internal_server_error():
+    logger = logging.getLogger("testlogger")
+    amqp_error = AMQPErrors.LinkDetach(
+        description="The service was unable to process the request; please retry the operation.",
+        condition=AMQPConstants.ErrorCodes.InternalServerError
+    )
+    sb_error = _create_servicebus_exception(logger, amqp_error)
+    assert isinstance(sb_error, ServiceBusError)
+    assert sb_error._retryable
+    assert sb_error._shutdown_handler