diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-30 18:03:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-30 18:03:55 +0000 |
| commit | 199a9e00e9c7d607011523a536d015c2883cd303 (patch) | |
| tree | 4fa85b93920ef9ccdd2032746375b4d262261877 | |
| parent | 15261b28d074b253bc52d2902ce04becd1e111d0 (diff) | |
| parent | 06eb8bc53225c2b58cd2ffeedad17b7428b5f1de (diff) | |
| download | ceilometer-199a9e00e9c7d607011523a536d015c2883cd303.tar.gz | |
Merge "Sync kombu_reconnect_delay from Oslo" into stable/icehouse
| -rw-r--r-- | ceilometer/openstack/common/rpc/impl_kombu.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ceilometer/openstack/common/rpc/impl_kombu.py b/ceilometer/openstack/common/rpc/impl_kombu.py index c8a6de0e..99e4e999 100644 --- a/ceilometer/openstack/common/rpc/impl_kombu.py +++ b/ceilometer/openstack/common/rpc/impl_kombu.py @@ -52,6 +52,10 @@ kombu_opts = [ default='', help=('SSL certification authority file ' '(valid only if SSL enabled)')), + cfg.FloatOpt('kombu_reconnect_delay', + default=1.0, + help='How long to wait before reconnecting in response to an ' + 'AMQP consumer cancel notification.'), cfg.StrOpt('rabbit_host', default='localhost', help='The RabbitMQ broker address where a single node is used'), @@ -495,6 +499,17 @@ class Connection(object): LOG.info(_("Reconnecting to AMQP server on " "%(hostname)s:%(port)d") % params) try: + # NOTE(bogdando): when reconnecting to a RabbitMQ cluster + # with mirrored queues in use, the attempt to release the + # connection can hang "indefinitely" somewhere deep down + # in Kombu. Blocking the thread for a bit prior to + # release seems to kludge around the problem where it is + # otherwise reproduceable. + if self.conf.kombu_reconnect_delay > 0: + LOG.info(_("Delaying reconnect for %1.1f seconds...") % + self.conf.kombu_reconnect_delay) + time.sleep(self.conf.kombu_reconnect_delay) + self.connection.release() except self.connection_errors: pass |