openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use more RMQ flags for less busy wait"

Browse Source
This commit is contained in:
Zuul 2021-08-19 18:20:13 +00:00 committed by Gerrit Code Review
commit a98076f11c
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/rabbitmq/defaults/main.yml
View File

@ -85,7 +85,7 @@ rabbitmq_user: "openstack"
rabbitmq_cluster_name: "openstack" rabbitmq_cluster_name: "openstack"
rabbitmq_hostname: "{{ ansible_facts.hostname }}" rabbitmq_hostname: "{{ ansible_facts.hostname }}"
rabbitmq_pid_file: "/var/lib/rabbitmq/mnesia/rabbitmq.pid" rabbitmq_pid_file: "/var/lib/rabbitmq/mnesia/rabbitmq.pid"
rabbitmq_server_additional_erl_args: "+S 2:2 +sbwt none" rabbitmq_server_additional_erl_args: "+S 2:2 +sbwt none +sbwtdcpu none +sbwtdio none"
# Dict of TLS options for RabbitMQ. Keys will be prefixed with 'ssl_options.'. # Dict of TLS options for RabbitMQ. Keys will be prefixed with 'ssl_options.'.
rabbitmq_tls_options: {} rabbitmq_tls_options: {}
# To avoid split-brain # To avoid split-brain

7
doc/source/reference/message-queues/rabbitmq.rst
View File

@ -97,7 +97,7 @@ already configures RabbitMQ server for IPv6 (if necessary). Any argument can be
passed there as documented in https://www.rabbitmq.com/runtime.html passed there as documented in https://www.rabbitmq.com/runtime.html
The default value for ``rabbitmq_server_additional_erl_args`` is ``+S 2:2 +sbwt The default value for ``rabbitmq_server_additional_erl_args`` is ``+S 2:2 +sbwt
none``. none +sbwtdcpu none +sbwtdio none``.
By default RabbitMQ starts N schedulers where N is the number of CPU cores, By default RabbitMQ starts N schedulers where N is the number of CPU cores,
including hyper-threaded cores. This is fine when you assume all CPUs are including hyper-threaded cores. This is fine when you assume all CPUs are
@ -106,5 +106,6 @@ Here we go for two scheduler threads (``+S 2:2``). More details can be found
here: https://www.rabbitmq.com/runtime.html#scheduling and here: here: https://www.rabbitmq.com/runtime.html#scheduling and here:
https://erlang.org/doc/man/erl.html#emulator-flags https://erlang.org/doc/man/erl.html#emulator-flags
The ``+sbwt`` argument prevents busy waiting of the scheduler, for more details The ``+sbwt none +sbwtdcpu none +sbwtdio none`` arguments prevent busy waiting
see: https://www.rabbitmq.com/runtime.html#busy-waiting. of the scheduler, for more details see:
https://www.rabbitmq.com/runtime.html#busy-waiting.

4
etc/kolla/globals.yml
View File

@ -416,8 +416,8 @@
# https://www.rabbitmq.com/runtime.html#scheduling # https://www.rabbitmq.com/runtime.html#scheduling
# https://www.rabbitmq.com/runtime.html#busy-waiting # https://www.rabbitmq.com/runtime.html#busy-waiting
# The default tells RabbitMQ to always use two cores (+S 2:2), # The default tells RabbitMQ to always use two cores (+S 2:2),
# and not to busy wait (+sbwt none): # and not to busy wait (+sbwt none +sbwtdcpu none +sbwtdio none):
#rabbitmq_server_additional_erl_args: "+S 2:2 +sbwt none" #rabbitmq_server_additional_erl_args: "+S 2:2 +sbwt none +sbwtdcpu none +sbwtdio none"
# Whether to enable TLS encryption for RabbitMQ client-server communication. # Whether to enable TLS encryption for RabbitMQ client-server communication.
#rabbitmq_enable_tls: "no" #rabbitmq_enable_tls: "no"
# CA certificate bundle in RabbitMQ container. # CA certificate bundle in RabbitMQ container.

2
releasenotes/notes/reduce-rabbit-busy-waiting-085433c822165eab.yaml
View File

@ -10,4 +10,4 @@ fixes:
upgrade: upgrade:
- | - |
Modifies the default value of ``rabbitmq_server_additional_erl_args`` from Modifies the default value of ``rabbitmq_server_additional_erl_args`` from
an empty string to ``+S 2:2 +sbwt none``. an empty string to ``+S 2:2 +sbwt none +sbwtdcpu none +sbwtdio none``.