diff options
author | Zuul <zuul@review.opendev.org> | 2020-10-15 17:53:23 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-10-15 17:53:23 +0000 |
commit | 2cc35f6b1ac95f2c472658a18131dc292f89f30e (patch) | |
tree | 959a75aaae237ac553d7a32bdd29307ef60508a3 | |
parent | 00d15eaeaba0ded0330cdcec7b19eee3adbfb1e1 (diff) | |
parent | add5ab4ecec090efdb9864bc9385f871f2dd082a (diff) | |
download | oslo-messaging-2cc35f6b1ac95f2c472658a18131dc292f89f30e.tar.gz |
Merge "Run rabbitmq heartbeat in python thread by default"
-rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 16 | ||||
-rw-r--r-- | releasenotes/notes/run-heartbeat-in-pthread-by-default-28637b41ebf500dc.yaml | 10 |
2 files changed, 19 insertions, 7 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index a4524d9..f436cbe 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. |