From a504abc557866704792c701ddc3bad4dc906e695 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: I8d8d9870c5c20f0d256c2000d893ea25c118b651 Closes-Bug: #1840868 --- manifests/init.pp | 12 ++++++++++++ ...itmq-heartbeat-over-pthread-9ade0b50b7da0598.yaml | 6 ++++++ spec/classes/octavia_init_spec.rb | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 releasenotes/notes/rabbitmq-heartbeat-over-pthread-9ade0b50b7da0598.yaml diff --git a/manifests/init.pp b/manifests/init.pp index a9e437c4..53012669 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -47,6 +47,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 +# # [*kombu_ssl_ca_certs*] # (optional) SSL certification authority file (valid only if SSL enabled). # Defaults to $::os_service_default @@ -220,6 +230,7 @@ class octavia ( $rabbit_use_ssl = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default, + $rabbit_heartbeat_in_pthread = $::os_service_default, $rabbit_ha_queues = $::os_service_default, $kombu_ssl_ca_certs = $::os_service_default, $kombu_ssl_certfile = $::os_service_default, @@ -278,6 +289,7 @@ class octavia ( 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_use_ssl => $rabbit_use_ssl, kombu_reconnect_delay => $kombu_reconnect_delay, kombu_failover_strategy => $kombu_failover_strategy, diff --git a/releasenotes/notes/rabbitmq-heartbeat-over-pthread-9ade0b50b7da0598.yaml b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-9ade0b50b7da0598.yaml new file mode 100644 index 00000000..496d2279 --- /dev/null +++ b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-9ade0b50b7da0598.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/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb index 22b3e309..47fbdaaf 100644 --- a/spec/classes/octavia_init_spec.rb +++ b/spec/classes/octavia_init_spec.rb @@ -33,6 +33,7 @@ describe 'octavia' do is_expected.to contain_octavia_config('DEFAULT/control_exchange').with_value('') is_expected.to contain_octavia_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') is_expected.to contain_octavia_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') + is_expected.to contain_octavia_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('') is_expected.to contain_octavia_config('oslo_messaging_rabbit/kombu_compression').with_value('') is_expected.to contain_octavia_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') is_expected.to contain_octavia_config('oslo_messaging_notifications/transport_url').with_value('') @@ -53,6 +54,7 @@ describe 'octavia' 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', :package_ensure => '2012.1.1-15.el6', @@ -69,6 +71,7 @@ describe 'octavia' do is_expected.to contain_octavia_config('DEFAULT/control_exchange').with_value('octavia') is_expected.to contain_octavia_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('60') is_expected.to contain_octavia_config('oslo_messaging_rabbit/heartbeat_rate').with_value('10') + is_expected.to contain_octavia_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value(true) is_expected.to contain_octavia_config('oslo_messaging_rabbit/kombu_compression').with_value('gzip') is_expected.to contain_octavia_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('shuffle') end