From add5ab4ecec090efdb9864bc9385f871f2dd082a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Fri, 21 Aug 2020 14:08:15 +0200 Subject: Run rabbitmq heartbeat in python thread by default Removing the experimental nature of this feature and activating it by default. Now to run heartbeat in a green thread users should set this option to False. Also deprecating this option to prepare future removal and force to always run heartbeat in a python thread whatever the context. Change-Id: I32a6c4ad0a456282ec02b5e4c8309489b3c17553 --- oslo_messaging/_drivers/impl_rabbit.py | 16 +++++++++------- ...heartbeat-in-pthread-by-default-28637b41ebf500dc.yaml | 10 ++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/run-heartbeat-in-pthread-by-default-28637b41ebf500dc.yaml diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 2f48541..d5cfc02 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -88,14 +88,16 @@ rabbit_opts = [ help='SSL certification authority file ' '(valid only if SSL enabled).'), cfg.BoolOpt('heartbeat_in_pthread', - default=False, - help="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 " + default=True, + help="Run the health check heartbeat thread " + "through a native python thread by default. If this " + "option is equal to False then the health check " + "heartbeat will inherit the execution model " + "from the parent process. For " + "example if the parent process has monkey patched the " "stdlib by using eventlet/greenlet then the heartbeat " - "will be run through a green thread."), + "will be run through a green thread.", + deprecated_for_removal=True), cfg.FloatOpt('kombu_reconnect_delay', default=1.0, deprecated_group='DEFAULT', diff --git a/releasenotes/notes/run-heartbeat-in-pthread-by-default-28637b41ebf500dc.yaml b/releasenotes/notes/run-heartbeat-in-pthread-by-default-28637b41ebf500dc.yaml new file mode 100644 index 0000000..383fbda --- /dev/null +++ b/releasenotes/notes/run-heartbeat-in-pthread-by-default-28637b41ebf500dc.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + The ``[oslo_messaging_rabbit] heartbeat_in_pthread`` config option now + defaults to ``True``. + Applications will run RabbitMQ heartbeat in a Python thread by default. +deprecations: + - | + ``heartbeat_in_pthread`` has been deprecated and will be removed in a + future release. If configured, this option should be unset. -- cgit v1.2.1