summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-08 13:09:28 +0000
committerGerrit Code Review <review@openstack.org>2013-07-08 13:09:28 +0000
commiteb605e8c1e2eacb4cae879a62e046cd0573c124d (patch)
tree1542bac7f64cec0353d62152085536d3cf2ad214
parent54fcea25407d6958cfd189f19e0e3c1ed12df91c (diff)
parentc37f6aaab3ac00b7865dee18158114433350237e (diff)
downloadoslo-master.zip
oslo-master.tar.gz
oslo-master.tar.xz
Merge "Add support for heartbeating in the kombu RPC driver"HEADmaster
-rw-r--r--openstack/common/rpc/impl_kombu.py4
-rw-r--r--tests/unit/rpc/test_kombu.py21
2 files changed, 18 insertions, 7 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py
index 36d2fc5..d1d04e0 100644
--- a/openstack/common/rpc/impl_kombu.py
+++ b/openstack/common/rpc/impl_kombu.py
@@ -82,6 +82,9 @@ kombu_opts = [
default=0,
help='maximum retries with trying to connect to RabbitMQ '
'(the default of 0 implies an infinite retry count)'),
+ cfg.IntOpt('rabbit_heartbeat',
+ default=60,
+ help='Seconds between connection keepalive heartbeats'),
cfg.BoolOpt('rabbit_durable_queues',
default=False,
help='use durable queues in RabbitMQ'),
@@ -449,6 +452,7 @@ class Connection(object):
'userid': self.conf.rabbit_userid,
'password': self.conf.rabbit_password,
'virtual_host': self.conf.rabbit_virtual_host,
+ 'heartbeat': self.conf.rabbit_heartbeat,
}
for sp_key, value in server_params.iteritems():
diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index cbe948d..9838652 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -364,7 +364,8 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase):
'password': FLAGS.rabbit_password,
'port': FLAGS.rabbit_port,
'virtual_host': FLAGS.rabbit_virtual_host,
- 'transport': 'memory'}])
+ 'transport': 'memory',
+ 'heartbeat': FLAGS.rabbit_heartbeat}])
def topic_send(_context, topic, msg):
pass
@@ -384,7 +385,8 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase):
'password': 'fake_password',
'hostname': 'fake_hostname',
'port': 31337,
- 'virtual_host': 'fake_virtual_host'}
+ 'virtual_host': 'fake_virtual_host',
+ 'heartbeat': FLAGS.rabbit_heartbeat}
class MyConnection(impl_kombu.Connection):
def __init__(myself, *args, **kwargs):
@@ -396,7 +398,8 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase):
'password': server_params['password'],
'port': server_params['port'],
'virtual_host': server_params['virtual_host'],
- 'transport': 'memory'}])
+ 'transport': 'memory',
+ 'heartbeat': FLAGS.rabbit_heartbeat}])
def topic_send(_context, topic, msg):
pass
@@ -764,25 +767,29 @@ class RpcKombuHATestCase(utils.BaseTestCase):
'password': FLAGS.rabbit_password,
'port': 1234,
'virtual_host': FLAGS.rabbit_virtual_host,
- 'transport': 'memory'},
+ 'transport': 'memory',
+ 'heartbeat': FLAGS.rabbit_heartbeat},
{'hostname': 'host2',
'userid': FLAGS.rabbit_userid,
'password': FLAGS.rabbit_password,
'port': 5678,
'virtual_host': FLAGS.rabbit_virtual_host,
- 'transport': 'memory'},
+ 'transport': 'memory',
+ 'heartbeat': FLAGS.rabbit_heartbeat},
{'hostname': '::1',
'userid': FLAGS.rabbit_userid,
'password': FLAGS.rabbit_password,
'port': 2345,
'virtual_host': FLAGS.rabbit_virtual_host,
- 'transport': 'memory'},
+ 'transport': 'memory',
+ 'heartbeat': FLAGS.rabbit_heartbeat},
{'hostname': '2001:0db8:85a3:0042:0000:8a2e:0370:7334',
'userid': FLAGS.rabbit_userid,
'password': FLAGS.rabbit_password,
'port': 5672,
'virtual_host': FLAGS.rabbit_virtual_host,
- 'transport': 'memory'},
+ 'transport': 'memory',
+ 'heartbeat': FLAGS.rabbit_heartbeat},
]
}