diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-07-11 05:43:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-11 05:43:29 +0000 |
| commit | f9f1b4f971f209feebb3bc6d32c397f4daa8ff1e (patch) | |
| tree | 5b97f5b32d5546e5350ad6cdaf1140f380503aee | |
| parent | c37f6aaab3ac00b7865dee18158114433350237e (diff) | |
Revert "Add support for heartbeating in the kombu RPC driver"
Fixes bug #1200069
Looks like there's a serious issue with the kombu heartbeat implementation.
This reverts commit c37f6aaab3ac00b7865dee18158114433350237e
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 4 | ||||
| -rw-r--r-- | tests/unit/rpc/test_kombu.py | 21 |
2 files changed, 7 insertions, 18 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index ce8f2d8..8fb3504 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -83,9 +83,6 @@ 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'), @@ -453,7 +450,6 @@ 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 470f98a..c8c3f32 100644 --- a/tests/unit/rpc/test_kombu.py +++ b/tests/unit/rpc/test_kombu.py @@ -362,8 +362,7 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase): 'password': FLAGS.rabbit_password, 'port': FLAGS.rabbit_port, 'virtual_host': FLAGS.rabbit_virtual_host, - 'transport': 'memory', - 'heartbeat': FLAGS.rabbit_heartbeat}]) + 'transport': 'memory'}]) def topic_send(_context, topic, msg): pass @@ -383,8 +382,7 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase): 'password': 'fake_password', 'hostname': 'fake_hostname', 'port': 31337, - 'virtual_host': 'fake_virtual_host', - 'heartbeat': FLAGS.rabbit_heartbeat} + 'virtual_host': 'fake_virtual_host'} class MyConnection(impl_kombu.Connection): def __init__(myself, *args, **kwargs): @@ -396,8 +394,7 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase): 'password': server_params['password'], 'port': server_params['port'], 'virtual_host': server_params['virtual_host'], - 'transport': 'memory', - 'heartbeat': FLAGS.rabbit_heartbeat}]) + 'transport': 'memory'}]) def topic_send(_context, topic, msg): pass @@ -739,29 +736,25 @@ class RpcKombuHATestCase(utils.BaseTestCase): 'password': FLAGS.rabbit_password, 'port': 1234, 'virtual_host': FLAGS.rabbit_virtual_host, - 'transport': 'memory', - 'heartbeat': FLAGS.rabbit_heartbeat}, + 'transport': 'memory'}, {'hostname': 'host2', 'userid': FLAGS.rabbit_userid, 'password': FLAGS.rabbit_password, 'port': 5678, 'virtual_host': FLAGS.rabbit_virtual_host, - 'transport': 'memory', - 'heartbeat': FLAGS.rabbit_heartbeat}, + 'transport': 'memory'}, {'hostname': '::1', 'userid': FLAGS.rabbit_userid, 'password': FLAGS.rabbit_password, 'port': 2345, 'virtual_host': FLAGS.rabbit_virtual_host, - 'transport': 'memory', - 'heartbeat': FLAGS.rabbit_heartbeat}, + 'transport': 'memory'}, {'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', - 'heartbeat': FLAGS.rabbit_heartbeat}, + 'transport': 'memory'}, ] } |