diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 9f63da028..cf1497125 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -140,16 +140,18 @@ rabbit_opts = [ default='AMQPLAIN', help='The RabbitMQ login method.'), cfg.IntOpt('rabbit_retry_interval', + min=1, default=1, help='How frequently to retry connecting with RabbitMQ.'), cfg.IntOpt('rabbit_retry_backoff', default=2, + min=0, help='How long to backoff for between retries when connecting ' 'to RabbitMQ.'), cfg.IntOpt('rabbit_interval_max', default=30, - help='Maximum interval of RabbitMQ connection retries. ' - 'Default is 30 seconds.'), + min=1, + help='Maximum interval of RabbitMQ connection retries.'), cfg.BoolOpt('rabbit_ha_queues', default=False, help='Try to use HA queues in RabbitMQ (x-ha-policy: all). ' @@ -1053,7 +1055,7 @@ class Connection: self.connection.ensure_connection( errback=on_error, max_retries=self.max_retries, - interval_start=self.interval_start or 1, + interval_start=self.interval_start, interval_step=self.interval_stepping, interval_max=self.interval_max, ) @@ -1156,7 +1158,7 @@ class Connection: execute_method, channel=self.channel, max_retries=retry, errback=on_error, - interval_start=self.interval_start or 1, + interval_start=self.interval_start, interval_step=self.interval_stepping, interval_max=self.interval_max, on_revive=on_reconnection) diff --git a/oslo_messaging/tests/drivers/test_impl_rabbit.py b/oslo_messaging/tests/drivers/test_impl_rabbit.py index 4d6ddea69..9181a95b2 100644 --- a/oslo_messaging/tests/drivers/test_impl_rabbit.py +++ b/oslo_messaging/tests/drivers/test_impl_rabbit.py @@ -1038,8 +1038,8 @@ class RpcKombuHATestCase(test_utils.BaseTestCase): super().setUp() transport_url = 'rabbit:/host1,host2,host3,host4,host5/' self.messaging_conf.transport_url = transport_url - self.config(rabbit_retry_interval=0.01, - rabbit_retry_backoff=0.01, + self.config(rabbit_retry_interval=1.0, + rabbit_retry_backoff=1.0, kombu_reconnect_delay=0, heartbeat_timeout_threshold=0, group="oslo_messaging_rabbit")