From d24edef117a356a473247db35a020a1f2c68f9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 13 Jul 2021 12:50:48 +0200 Subject: [PATCH] Remove deprecation of heartbeat_in_pthread In some circumstances services can be executed outside of mod_wsgi and in a monkey patched environment. In this context we need to leave the possibility to users to execute the heartbeat in a green thread. The heartbeat_in_pthread was tagged as depreacted few months and planned for a future removal. These changes drop this deprecation to allow to enable green threads if needed. Closes-Bug: #1934937 Change-Id: Iee2e5a6f7d71acba70bbc857f0bd7d83e32a7b8c --- oslo_messaging/_drivers/impl_rabbit.py | 2 +- .../undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 9d99822d5..16df5deea 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -97,7 +97,7 @@ rabbit_opts = [ "example if the parent process has monkey patched the " "stdlib by using eventlet/greenlet then the heartbeat " "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/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml b/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml new file mode 100644 index 000000000..4c71b9feb --- /dev/null +++ b/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + We undeprecated the ``heartbeat_in_pthread`` option. This option will + remain available to allow customers to run the rabbitmq heartbeat in + python thread or not.