openstack/puppet-swift
Code Issues Proposed changes

Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

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

Change-Id: I04db4f346e2629218266355c88740243b28886cc
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 11:02:12 +09:00
parent 62dbcf2178
commit f631648816
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/proxy/ceilometer.pp
View File

@@ -161,18 +161,6 @@
# (string value) # (string value)
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# 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
#
# == Examples # == Examples
# #
# == Authors # == Authors
@@ -218,8 +206,6 @@ class swift::proxy::ceilometer (
$kombu_reconnect_delay = $facts['os_service_default'], $kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'], $kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits swift { ) inherits swift {
include swift::deps include swift::deps
include swift::params include swift::params
@@ -274,7 +260,6 @@ class swift::proxy::ceilometer (
rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit, rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate, heartbeat_rate => $rabbit_heartbeat_rate,
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count, rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
amqp_durable_queues => $amqp_durable_queues, amqp_durable_queues => $amqp_durable_queues,
amqp_auto_delete => $amqp_auto_delete, amqp_auto_delete => $amqp_auto_delete,

5
releasenotes/notes/remove-rabbit_heartbeat_in_pthread-8a6f67a0eecb4edd.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The ``swift::proxy::ceilometer::rabbit_heartbeat_in_pthread`` parameter has
been removed.

1
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@@ -83,7 +83,6 @@ describe 'swift::proxy::ceilometer' do
:rabbit_transient_quorum_queue => '<SERVICE DEFAULT>', :rabbit_transient_quorum_queue => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>', :heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>', :heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>', :rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>', :amqp_durable_queues => '<SERVICE DEFAULT>',
:amqp_auto_delete => '<SERVICE DEFAULT>', :amqp_auto_delete => '<SERVICE DEFAULT>',