From 487e8d9a0febbc89dc558e0a45b61e8a82aaadce Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 10 May 2024 18:49:19 +0200 Subject: [PATCH] Add qos_prefetch_count to variables When rabbit_stream_fanout is set to true, rabbit_qos_prefetch_count should be set to a positive value. This also fixes defenition of transient_quorum_queue as if rabbit_stream_fanout is enabled - transient_quorum_queue should be also enabled. [1] [1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L726-L736 Change-Id: I9c89c31e56d6c61d8ddbeb6ba1fb85140620a6bf --- defaults/main.yml | 5 +++-- templates/designate.conf.j2 | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 42b2b71..a15e026 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -130,9 +130,10 @@ designate_oslomsg_notify_policies: [] ## RabbitMQ integration designate_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" -designate_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(designate_oslomsg_rabbit_quorum_queues) }}" -designate_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(designate_oslomsg_rabbit_quorum_queues) }}" designate_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(designate_oslomsg_rabbit_quorum_queues) }}" +designate_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(designate_oslomsg_rabbit_stream_fanout) }}" +designate_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(designate_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}" +designate_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(designate_oslomsg_rabbit_quorum_queues) }}" designate_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" designate_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index 82ff78e..9001c6c 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -32,7 +32,8 @@ ssl = {{ designate_oslomsg_rpc_use_ssl }} rabbit_notification_exchange = designate rabbit_notification_topic = notifications rabbit_quorum_queue = {{ designate_oslomsg_rabbit_quorum_queues }} -transient_quorum_queue = {{ designate_oslomsg_rabbit_transient_quorum_queues }} +rabbit_transient_quorum_queue = {{ designate_oslomsg_rabbit_transient_quorum_queues }} +rabbit_qos_prefetch_count = {{ designate_oslomsg_rabbit_qos_prefetch_count }} use_queue_manager = {{ designate_oslomsg_rabbit_queue_manager }} rabbit_stream_fanout = {{ designate_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ designate_oslomsg_rabbit_quorum_delivery_limit }}