From 0fb9c10264f9ce36bd67b347cb9e9404e48107e5 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 21 Aug 2019 14:21:01 +0800 Subject: [PATCH] Introduce the new rabbit_heartbeat_in_pthread option oslo.messaging RabbitMQ driver have now a new option that allow user to run the RabbitMQ heartbeat over a native python thread. These change allow user to use this new option. Change-Id: Ifb1985b466254e62075cd85d7168a75d4e9a8ead Closes-Bug: #1840868 --- manifests/init.pp | 12 ++++++++++++ ...itmq-heartbeat-over-pthread-a4ccf632450fe566.yaml | 6 ++++++ spec/classes/tacker_init_spec.rb | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 releasenotes/notes/rabbitmq-heartbeat-over-pthread-a4ccf632450fe566.yaml diff --git a/manifests/init.pp b/manifests/init.pp index d4e20d8..29aa17d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -51,6 +51,16 @@ # every 30 seconds. # Defaults to $::os_service_default # +# [*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 $::os_service_default +# # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ # Defaults to $::os_service_default @@ -183,6 +193,7 @@ class tacker( $control_exchange = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default, + $rabbit_heartbeat_in_pthread = $::os_service_default, $rabbit_use_ssl = $::os_service_default, $rabbit_ha_queues = $::os_service_default, $kombu_ssl_ca_certs = $::os_service_default, @@ -222,6 +233,7 @@ class tacker( rabbit_use_ssl => $rabbit_use_ssl, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, + heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, kombu_reconnect_delay => $kombu_reconnect_delay, kombu_failover_strategy => $kombu_failover_strategy, amqp_durable_queues => $amqp_durable_queues, diff --git a/releasenotes/notes/rabbitmq-heartbeat-over-pthread-a4ccf632450fe566.yaml b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-a4ccf632450fe566.yaml new file mode 100644 index 0000000..496d227 --- /dev/null +++ b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-a4ccf632450fe566.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Allow users to run the RabbitMQ heartbeat over a native python thread in the + oslo.messaging RabbitMQ driver, by using the `rabbit_heartbeat_in_pthread` + option in configuration. diff --git a/spec/classes/tacker_init_spec.rb b/spec/classes/tacker_init_spec.rb index b679a41..7c7a91a 100644 --- a/spec/classes/tacker_init_spec.rb +++ b/spec/classes/tacker_init_spec.rb @@ -20,6 +20,7 @@ describe 'tacker' do is_expected.to contain_tacker_config('DEFAULT/control_exchange').with_value('') is_expected.to contain_tacker_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') is_expected.to contain_tacker_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') + is_expected.to contain_tacker_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('') is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_compression').with_value('') is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') is_expected.to contain_tacker_config('oslo_messaging_notifications/transport_url').with_value('') @@ -38,6 +39,7 @@ describe 'tacker' do :rabbit_ha_queues => 'undef', :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', + :rabbit_heartbeat_in_pthread => true, :kombu_compression => 'gzip', :kombu_failover_strategy => 'shuffle', :notification_transport_url => 'rabbit://user:pass@host:1234/virt', @@ -52,6 +54,7 @@ describe 'tacker' do is_expected.to contain_tacker_config('DEFAULT/control_exchange').with_value('tacker') is_expected.to contain_tacker_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('60') is_expected.to contain_tacker_config('oslo_messaging_rabbit/heartbeat_rate').with_value('10') + is_expected.to contain_tacker_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value(true) is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_compression').with_value('gzip') is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('shuffle') is_expected.to contain_tacker_config('oslo_messaging_notifications/transport_url').with_value('rabbit://user:pass@host:1234/virt')