From 73271ab30c094bea21f9e0a752f423e749e44add Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 15 Sep 2023 08:46:04 +0900 Subject: [PATCH] RabbitMQ: Add support for quorum queue options Depends-on: https://review.opendev.org/894866 Change-Id: I447aca06bb1e0050c01bd1e21eb6942602d2643e --- manifests/init.pp | 52 ++++++++++++++----- .../rabbit-quorum-queue-8ba93415db4ec17f.yaml | 4 ++ spec/classes/cinder_init_spec.rb | 50 +++++++++++------- 3 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 releasenotes/notes/rabbit-quorum-queue-8ba93415db4ec17f.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 1f39cce7..6349d9de 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -69,6 +69,24 @@ # will be run through a green thread. # Defaults to $facts['os_service_default'] # +# [*rabbit_quorum_queue*] +# (Optional) Use quorum queues in RabbitMQ. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_delivery_limit*] +# (Optional) Each time a message is rdelivered to a consumer, a counter is +# incremented. Once the redelivery count exceeds the delivery limit +# the message gets dropped or dead-lettered. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_max_memory_length*] +# (Optional) Limit the number of messages in the quorum queue. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_max_memory_bytes*] +# (Optional) Limit the number of memory bytes used by the quorum queue. +# Defaults to $facts['os_service_default'] +# # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ # Defaults to $facts['os_service_default'] @@ -270,6 +288,10 @@ class cinder ( $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_in_pthread = $facts['os_service_default'], + $rabbit_quorum_queue = $facts['os_service_default'], + $rabbit_quorum_delivery_limit = $facts['os_service_default'], + $rabbit_quorum_max_memory_length = $facts['os_service_default'], + $rabbit_quorum_max_memory_bytes = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'], $service_down_time = $facts['os_service_default'], $report_interval = $facts['os_service_default'], @@ -329,19 +351,23 @@ class cinder ( } oslo::messaging::rabbit { 'cinder_config': - rabbit_ha_queues => $rabbit_ha_queues, - heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, - heartbeat_rate => $rabbit_heartbeat_rate, - heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, - rabbit_use_ssl => $rabbit_use_ssl, - kombu_reconnect_delay => $kombu_reconnect_delay, - kombu_failover_strategy => $kombu_failover_strategy, - kombu_ssl_version => $kombu_ssl_version, - kombu_ssl_keyfile => $kombu_ssl_keyfile, - kombu_ssl_certfile => $kombu_ssl_certfile, - kombu_ssl_ca_certs => $kombu_ssl_ca_certs, - amqp_durable_queues => $amqp_durable_queues, - kombu_compression => $kombu_compression, + rabbit_ha_queues => $rabbit_ha_queues, + heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, + heartbeat_rate => $rabbit_heartbeat_rate, + heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, + rabbit_use_ssl => $rabbit_use_ssl, + kombu_reconnect_delay => $kombu_reconnect_delay, + kombu_failover_strategy => $kombu_failover_strategy, + kombu_ssl_version => $kombu_ssl_version, + kombu_ssl_keyfile => $kombu_ssl_keyfile, + kombu_ssl_certfile => $kombu_ssl_certfile, + kombu_ssl_ca_certs => $kombu_ssl_ca_certs, + amqp_durable_queues => $amqp_durable_queues, + kombu_compression => $kombu_compression, + rabbit_quorum_queue => $rabbit_quorum_queue, + rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit, + rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length, + rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, } oslo::messaging::amqp { 'cinder_config': diff --git a/releasenotes/notes/rabbit-quorum-queue-8ba93415db4ec17f.yaml b/releasenotes/notes/rabbit-quorum-queue-8ba93415db4ec17f.yaml new file mode 100644 index 00000000..f41e2371 --- /dev/null +++ b/releasenotes/notes/rabbit-quorum-queue-8ba93415db4ec17f.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The ``cinder`` class now supports options for quorum queues in RabbitMQ. diff --git a/spec/classes/cinder_init_spec.rb b/spec/classes/cinder_init_spec.rb index b6777b50..a6a13f7f 100644 --- a/spec/classes/cinder_init_spec.rb +++ b/spec/classes/cinder_init_spec.rb @@ -25,20 +25,24 @@ describe 'cinder' do :control_exchange => '' ) is_expected.to contain_oslo__messaging__rabbit('cinder_config').with( - :rabbit_use_ssl => '', - :heartbeat_timeout_threshold => '', - :heartbeat_rate => '', - :heartbeat_in_pthread => '', - :kombu_reconnect_delay => '', - :kombu_failover_strategy => '', - :amqp_durable_queues => '', - :kombu_compression => '', - :kombu_ssl_ca_certs => '', - :kombu_ssl_certfile => '', - :kombu_ssl_keyfile => '', - :kombu_ssl_version => '', - :rabbit_ha_queues => '', - :rabbit_retry_interval => '', + :rabbit_use_ssl => '', + :heartbeat_timeout_threshold => '', + :heartbeat_rate => '', + :heartbeat_in_pthread => '', + :kombu_reconnect_delay => '', + :kombu_failover_strategy => '', + :amqp_durable_queues => '', + :kombu_compression => '', + :kombu_ssl_ca_certs => '', + :kombu_ssl_certfile => '', + :kombu_ssl_keyfile => '', + :kombu_ssl_version => '', + :rabbit_ha_queues => '', + :rabbit_retry_interval => '', + :rabbit_quorum_queue => '', + :rabbit_quorum_delivery_limit => '', + :rabbit_quorum_max_memory_length => '', + :rabbit_quorum_max_memory_bytes => '', ) is_expected.to contain_oslo__messaging__amqp('cinder_config').with( :server_request_prefix => '', @@ -101,19 +105,27 @@ describe 'cinder' do ) } end - context 'with rabbitmq heartbeats' do + context 'with rabbitmq options' do let :params do req_params.merge( :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true + :rabbit_heartbeat_in_pthread => true, + :rabbit_quorum_queue => true, + :rabbit_quorum_delivery_limit => 3, + :rabbit_quorum_max_memory_length => 5, + :rabbit_quorum_max_memory_bytes => 1073741824, ) end it { is_expected.to contain_oslo__messaging__rabbit('cinder_config').with( - :heartbeat_timeout_threshold => '60', - :heartbeat_rate => '10', - :heartbeat_in_pthread => true, + :heartbeat_timeout_threshold => '60', + :heartbeat_rate => '10', + :heartbeat_in_pthread => true, + :rabbit_quorum_queue => true, + :rabbit_quorum_delivery_limit => 3, + :rabbit_quorum_max_memory_length => 5, + :rabbit_quorum_max_memory_bytes => 1073741824, ) } end