Add configuration option for heartbeat_in_pthread

This configuration option has been observed to result in file
descriptor leaks in certain circumstances. A variable is added
here so that it can be easily overridden.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/835548
Change-Id: I833d72715daff81b64da077e899615b9b2002650
Related-Bug: #1961603
(cherry picked from commit 01951cd77b)
This commit is contained in:
Andrew Bonney 2022-03-11 09:28:12 +00:00 committed by Jonathan Rosser
parent b64309bd96
commit 32a5fdf167
3 changed files with 10 additions and 0 deletions

View File

@ -230,6 +230,10 @@ neutron_galera_port: "{{ galera_port | default('3306') }}"
### Oslo Messaging
###
# RabbitMQ
neutron_oslomsg_heartbeat_in_pthread: "{{ oslomsg_heartbeat_in_pthread | default(False) }}"
# RPC
neutron_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes a file descriptor leak which may impact services which use the
oslo.messaging RabbitMQ heartbeat mechanism.

View File

@ -221,6 +221,7 @@ root_helper_daemon = sudo {{ neutron_bin }}/neutron-rootwrap-daemon {{ neutron_c
# Messaging
[oslo_messaging_rabbit]
rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
heartbeat_in_pthread = {{ neutron_oslomsg_heartbeat_in_pthread }}
# Notifications
[oslo_messaging_notifications]