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: I6a2f146c0aae9c9361194671de34642db3e3bfb9
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 10:54:39 +09:00
parent 20fbc97f67
commit 39472d72e9
3 changed files with 4 additions and 18 deletions

View File

@@ -178,18 +178,6 @@
# in the watcher 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.
#
# === Authors
#
# Daniel Pawlik <daniel.pawlik@corp.ovh.com>
@@ -231,8 +219,6 @@ class watcher (
$notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'],
Boolean $purge_config = false,
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include openstacklib::openstackclient
@@ -282,7 +268,6 @@ class watcher (
rabbit_transient_queues_ttl => $rabbit_transient_queues_ttl,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate,
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
}
oslo::messaging::default { 'watcher_config':

View File

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

View File

@@ -40,7 +40,6 @@ describe 'watcher' do
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>',
@@ -94,7 +93,6 @@ describe 'watcher' do
:rabbit_enable_cancel_on_failover => false,
:rabbit_heartbeat_timeout_threshold => '60',
:rabbit_heartbeat_rate => '10',
:rabbit_heartbeat_in_pthread => true,
:amqp_durable_queues => true,
:kombu_compression => 'gzip',
:kombu_failover_strategy => 'shuffle',
@@ -119,7 +117,6 @@ describe 'watcher' do
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '60',
:heartbeat_rate => '10',
:heartbeat_in_pthread => true,
:kombu_reconnect_delay => '5.0',
:kombu_failover_strategy => 'shuffle',
:amqp_durable_queues => true,