diff options
| author | Sean Mooney <work@seanmooney.info> | 2020-10-12 22:43:31 +0100 |
|---|---|---|
| committer | Daniel Bengtsson <dbengt@redhat.com> | 2020-10-19 13:09:54 +0200 |
| commit | 7c9b070f5bc07692c837f9915eb0d8525065d0f6 (patch) | |
| tree | 2e80fb7abc8639f83ccafc2cebb39209de1ab1a1 | |
| parent | 0a432c7fb107d04f7a41199fe9a8c4fbd344d009 (diff) | |
| download | oslo-messaging-7c9b070f5bc07692c837f9915eb0d8525065d0f6.tar.gz | |
add min of 1 to rpc_conn_pool_size12.1.5
This change add a min value of 1 to
[oslo_messaging_rabbit]/rpc_conn_pool_size
such that there is always at least 1 connection avaiable.
This change add a runtime check to ensure that
[oslo_messaging_rabbit]/rpc_conn_pool_size is greater than
or equal too [oslo_messaging_rabbit]/conn_pool_min_size
Change-Id: I2ad4b9f1d012c9f0586a932ac27d96da1bcc4e4c
Closes-Bug: #1899533
(cherry picked from commit 00d15eaeaba0ded0330cdcec7b19eee3adbfb1e1)
(cherry picked from commit 8f5847dcbe5144272ff7295fce2b50a9f544e5b0)
| -rw-r--r-- | oslo_messaging/_drivers/base.py | 3 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 4 | ||||
| -rw-r--r-- | oslo_messaging/tests/drivers/test_impl_rabbit.py | 15 |
3 files changed, 21 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/base.py b/oslo_messaging/_drivers/base.py index fb44540..f8e819e 100644 --- a/oslo_messaging/_drivers/base.py +++ b/oslo_messaging/_drivers/base.py @@ -25,7 +25,8 @@ from oslo_messaging import exceptions base_opts = [ cfg.IntOpt('rpc_conn_pool_size', default=30, deprecated_group='DEFAULT', - help='Size of RPC connection pool.'), + help='Size of RPC connection pool.', + min=1), cfg.IntOpt('conn_pool_min_size', default=2, help='The pool size limit for connections expiration policy'), cfg.IntOpt('conn_pool_ttl', default=1200, diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 6bbd866..dbce2b5 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -1391,6 +1391,10 @@ class RabbitDriver(amqpdriver.AMQPDriverBase): # the pool configuration properties max_size = conf.oslo_messaging_rabbit.rpc_conn_pool_size min_size = conf.oslo_messaging_rabbit.conn_pool_min_size + if max_size < min_size: + raise RuntimeError( + f"rpc_conn_pool_size: {max_size} must be greater than " + f"or equal to conn_pool_min_size: {min_size}") ttl = conf.oslo_messaging_rabbit.conn_pool_ttl connection_pool = pool.ConnectionPool( diff --git a/oslo_messaging/tests/drivers/test_impl_rabbit.py b/oslo_messaging/tests/drivers/test_impl_rabbit.py index 39a90a0..fab29a9 100644 --- a/oslo_messaging/tests/drivers/test_impl_rabbit.py +++ b/oslo_messaging/tests/drivers/test_impl_rabbit.py @@ -33,6 +33,7 @@ from oslo_messaging._drivers import common as driver_common from oslo_messaging._drivers import impl_rabbit as rabbit_driver from oslo_messaging.exceptions import MessageDeliveryFailure from oslo_messaging.tests import utils as test_utils +from oslo_messaging.transport import DriverLoadFailure from six.moves import mock load_tests = testscenarios.load_tests_apply_scenarios @@ -143,6 +144,20 @@ class TestRabbitDriverLoad(test_utils.BaseTestCase): self.assertIsInstance(driver, rabbit_driver.RabbitDriver) + @mock.patch('oslo_messaging._drivers.impl_rabbit.Connection' + '.ensure_connection') + @mock.patch('oslo_messaging._drivers.impl_rabbit.Connection.reset') + def test_driver_load_max_less_than_min(self, fake_ensure, fake_reset): + self.config( + rpc_conn_pool_size=1, conn_pool_min_size=2, + group='oslo_messaging_rabbit') + self.messaging_conf.transport_url = self.transport_url + error = self.assertRaises( + DriverLoadFailure, oslo_messaging.get_transport, self.conf) + self.assertIn( + "rpc_conn_pool_size: 1 must be greater than or equal " + "to conn_pool_min_size: 2", str(error)) + class TestRabbitDriverLoadSSL(test_utils.BaseTestCase): scenarios = [ |