Merge "Add ERL args parameter for rabbit and set the busy wait threshold to none" into stable/queens

This commit is contained in:
Zuul 2018-10-17 00:47:38 +00:00 committed by Gerrit Code Review
commit fc21f6d610
2 changed files with 17 additions and 0 deletions

View File

@ -63,6 +63,14 @@ parameters:
net_ticktime kernel variable.
default: 15
type: number
RabbitAdditionalErlArgs:
description:
Additional parameters passed to the Erlang subsystem. The string
needs to be enclosed in quotes twice. We default to +sbwt none
in order to have the erlang vm be less busy on spinlocks, but
we allow a simple way of overriding it.
default: "'+sbwt none'"
type: string
MonitoringSubscriptionRabbitmq:
default: 'overcloud-rabbitmq'
type: string
@ -104,6 +112,7 @@ outputs:
NODE_IP_ADDRESS: ''
RABBITMQ_NODENAME: "rabbit@%{::hostname}"
RABBITMQ_SERVER_ERL_ARGS: '"+K true +P 1048576 -kernel inet_default_connect_options [{nodelay,true}]"'
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS: {get_param: RabbitAdditionalErlArgs}
'export ERL_EPMD_ADDRESS': "%{hiera('rabbitmq::interface')}"
rabbitmq_kernel_variables:
inet_dist_listen_min: '25672'

View File

@ -0,0 +1,8 @@
---
other:
- |
A new parameter called 'RabbitAdditionalErlArgs' that specifies additional arguments
to the Erlang VM has been added. It now defaults to "'+sbwt none'" (http://erlang.org/doc/man/erl.html#+sbwt)
This threshold determines how long schedulers are to busy wait when running out of work before going to sleep.
By setting it to none we let the erlang threads go to sleep right away when they do not have any work to
do.