From 562c41bb78f578ff9c27633c04ac6dd914c55f5a Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Mon, 27 Apr 2015 15:51:42 +0200 Subject: rabbit: add some notes about heartbeat Heartbeat is supported only with recent version of kombu (>=3.0.7) and amqp (>=1.4.0) Related-bug: #1436769 Change-Id: I938741d953b4db9e6f56858677220c5d6624af2d --- oslo_messaging/_drivers/impl_rabbit.py | 3 ++- requirements.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index ee641c7..437f2de 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -126,7 +126,8 @@ rabbit_opts = [ default=0, help="Number of seconds after which the Rabbit broker is " "considered down if heartbeat's keep-alive fails " - "(0 disable the heartbeat). EXPERIMENTAL"), + "(0 disables the heartbeat, >0 enables it. Enabling heartbeats " + "requires kombu>=3.0.7 and amqp>=1.4.0). EXPERIMENTAL"), cfg.IntOpt('heartbeat_rate', default=2, help='How often times during the heartbeat_timeout_threshold ' diff --git a/requirements.txt b/requirements.txt index 3b49a53..4e87ee6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,6 +22,7 @@ eventlet>=0.16.1 PyYAML>=3.1.0 # rabbit driver is the default +# require kombu>=3.0.7 and amqp>=1.4.0 for heatbeat support kombu>=2.5.0 # middleware -- cgit v1.2.1