Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

This feature is known to break services using eventlet and is highly
discouraged now.

Change-Id: Ie4ac2313822ae6bd3bae73d3b81cc0a537d0944e
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 10:50:09 +09:00
parent b3e8828490
commit b8f3594d3b
3 changed files with 4 additions and 18 deletions

View File

@@ -166,18 +166,6 @@
# in the magnum config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
# through a native python thread. By default if this
# option isn't provided the health check heartbeat will
# inherit the execution model from the parent process. By
# example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread.
# Defaults to undef
#
class magnum (
$package_ensure = 'present',
$host = $facts['os_service_default'],
@@ -212,8 +200,6 @@ class magnum (
$amqp_durable_queues = $facts['os_service_default'],
$amqp_auto_delete = $facts['os_service_default'],
Boolean $purge_config = false,
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include magnum::deps
include magnum::params
@@ -238,7 +224,6 @@ class magnum (
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_qos_prefetch_count => $rabbit_qos_prefetch_count,
rabbit_use_ssl => $rabbit_use_ssl,
kombu_reconnect_delay => $kombu_reconnect_delay,

View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``magnum::rabbit_heartbeat_in_pthread`` parameter has been removed.

View File

@@ -39,7 +39,6 @@ describe 'magnum' do
:rabbit_ha_queues => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
@@ -89,7 +88,6 @@ describe 'magnum' do
:rabbit_ha_queues => true,
:rabbit_heartbeat_timeout_threshold => 60,
:rabbit_heartbeat_rate => 10,
:rabbit_heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0,
:amqp_durable_queues => true,
:amqp_auto_delete => true,
@@ -127,7 +125,6 @@ describe 'magnum' do
:rabbit_ha_queues => true,
:heartbeat_timeout_threshold => 60,
:heartbeat_rate => 10,
:heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0,
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>',