diff options
| author | Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com> | 2023-02-13 18:24:20 +0100 |
|---|---|---|
| committer | Dmitriy Rabotyagov <noonedeadpunk@gmail.com> | 2023-02-14 15:20:00 +0000 |
| commit | 115cfb5b7cff2a9803d64d02b98250b7b0fc09f0 (patch) | |
| tree | b3af9f62da5329b53e521be64cadc83e36a6aca5 | |
| parent | 687dea2e65814606bece8041fe94fb2674d2590b (diff) | |
| download | oslo-messaging-115cfb5b7cff2a9803d64d02b98250b7b0fc09f0.tar.gz | |
Fix typo in quorum-related variables for RabbitMQ
In [1] there was a typo made in variable names. To prevent even futher
awkwardness regarding variable naming, we fix typo and publish a
release note for ones that already using variables in their deployments.
[1] https://review.opendev.org/c/openstack/oslo.messaging/+/831058
Change-Id: Icc438397c11521f3e5e9721f85aba9095e0831c2
| -rw-r--r-- | doc/source/admin/rabbit.rst | 4 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 10 | ||||
| -rw-r--r-- | releasenotes/notes/rabbit_quorum_typo-9c06a9fd8d767f53.yaml | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/doc/source/admin/rabbit.rst b/doc/source/admin/rabbit.rst index b9433a5..4e0e6b0 100644 --- a/doc/source/admin/rabbit.rst +++ b/doc/source/admin/rabbit.rst @@ -242,8 +242,8 @@ Consuming Options - :oslo.config:option:`oslo_messaging_rabbit.rabbit_ha_queues` - :oslo.config:option:`oslo_messaging_rabbit.rabbit_quorum_queue` - :oslo.config:option:`oslo_messaging_rabbit.rabbit_quorum_delivery_limit` -- :oslo.config:option:`oslo_messaging_rabbit.rabbit_quroum_max_memory_length` -- :oslo.config:option:`oslo_messaging_rabbit.rabbit_quroum_max_memory_bytes` +- :oslo.config:option:`oslo_messaging_rabbit.rabbit_quorum_max_memory_length` +- :oslo.config:option:`oslo_messaging_rabbit.rabbit_quorum_max_memory_bytes` - :oslo.config:option:`oslo_messaging_rabbit.rabbit_transient_queues_ttl` Connection Options diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index c61393c..d00a6ab 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -174,7 +174,8 @@ rabbit_opts = [ 'or dead-lettered (if a DLX exchange has been configured) ' 'Used only when rabbit_quorum_queue is enabled, ' 'Default 0 which means dont set a limit.'), - cfg.IntOpt('rabbit_quroum_max_memory_length', + cfg.IntOpt('rabbit_quorum_max_memory_length', + deprecated_name='rabbit_quroum_max_memory_length', default=0, help='By default all messages are maintained in memory ' 'if a quorum queue grows in length it can put memory ' @@ -182,7 +183,8 @@ rabbit_opts = [ 'of messages in the quorum queue. ' 'Used only when rabbit_quorum_queue is enabled, ' 'Default 0 which means dont set a limit.'), - cfg.IntOpt('rabbit_quroum_max_memory_bytes', + cfg.IntOpt('rabbit_quorum_max_memory_bytes', + deprecated_name='rabbit_quroum_max_memory_bytes', default=0, help='By default all messages are maintained in memory ' 'if a quorum queue grows in length it can put memory ' @@ -835,8 +837,8 @@ class Connection(object): def _get_quorum_configurations(self, driver_conf): """Get the quorum queue configurations""" delivery_limit = driver_conf.rabbit_quorum_delivery_limit - max_memory_length = driver_conf.rabbit_quroum_max_memory_length - max_memory_bytes = driver_conf.rabbit_quroum_max_memory_bytes + max_memory_length = driver_conf.rabbit_quorum_max_memory_length + max_memory_bytes = driver_conf.rabbit_quorum_max_memory_bytes return QuorumMemConfig(delivery_limit, max_memory_length, max_memory_bytes) diff --git a/releasenotes/notes/rabbit_quorum_typo-9c06a9fd8d767f53.yaml b/releasenotes/notes/rabbit_quorum_typo-9c06a9fd8d767f53.yaml new file mode 100644 index 0000000..c2747d4 --- /dev/null +++ b/releasenotes/notes/rabbit_quorum_typo-9c06a9fd8d767f53.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed typo in variable names ``rabbit_quorum_max_memory_length`` + and ``rabbit_quorum_max_memory_bytes``. Please make changes in your + config files to correspond correct variables. |