openstack/oslo.messaging
Code Issues Proposed changes

Fix typo in quorum-related variables for RabbitMQ

Browse Source 
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
This commit is contained in:
Dmitriy Rabotyagov 2023-02-13 18:24:20 +01:00 committed by Dmitriy Rabotyagov
parent 687dea2e65
commit 115cfb5b7c
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/admin/rabbit.rst
View File

@ -242,8 +242,8 @@ Consuming Options
- :oslo.config:option:`oslo_messaging_rabbit.rabbit_ha_queues` - :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_queue`
- :oslo.config:option:`oslo_messaging_rabbit.rabbit_quorum_delivery_limit` - :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_quorum_max_memory_length`
- :oslo.config:option:`oslo_messaging_rabbit.rabbit_quroum_max_memory_bytes` - :oslo.config:option:`oslo_messaging_rabbit.rabbit_quorum_max_memory_bytes`
- :oslo.config:option:`oslo_messaging_rabbit.rabbit_transient_queues_ttl` - :oslo.config:option:`oslo_messaging_rabbit.rabbit_transient_queues_ttl`
Connection Options Connection Options

10
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -174,7 +174,8 @@ rabbit_opts = [
'or dead-lettered (if a DLX exchange has been configured) ' 'or dead-lettered (if a DLX exchange has been configured) '
'Used only when rabbit_quorum_queue is enabled, ' 'Used only when rabbit_quorum_queue is enabled, '
'Default 0 which means dont set a limit.'), '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, default=0,
help='By default all messages are maintained in memory ' help='By default all messages are maintained in memory '
'if a quorum queue grows in length it can put memory ' 'if a quorum queue grows in length it can put memory '
@ -182,7 +183,8 @@ rabbit_opts = [
'of messages in the quorum queue. ' 'of messages in the quorum queue. '
'Used only when rabbit_quorum_queue is enabled, ' 'Used only when rabbit_quorum_queue is enabled, '
'Default 0 which means dont set a limit.'), '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, default=0,
help='By default all messages are maintained in memory ' help='By default all messages are maintained in memory '
'if a quorum queue grows in length it can put 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): def _get_quorum_configurations(self, driver_conf):
"""Get the quorum queue configurations""" """Get the quorum queue configurations"""
delivery_limit = driver_conf.rabbit_quorum_delivery_limit delivery_limit = driver_conf.rabbit_quorum_delivery_limit
max_memory_length = driver_conf.rabbit_quroum_max_memory_length max_memory_length = driver_conf.rabbit_quorum_max_memory_length
max_memory_bytes = driver_conf.rabbit_quroum_max_memory_bytes max_memory_bytes = driver_conf.rabbit_quorum_max_memory_bytes
return QuorumMemConfig(delivery_limit, max_memory_length, return QuorumMemConfig(delivery_limit, max_memory_length,
max_memory_bytes) max_memory_bytes)

6
releasenotes/notes/rabbit_quorum_typo-9c06a9fd8d767f53.yaml Normal file
View File

@ -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.