openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "amqp1: fix race when reconnecting" into stable/xena

This commit is contained in:
Zuul 2022-04-08 14:44:36 +00:00 committed by Gerrit Code Review
parent 3b5a0543e9 d57eccd862
commit 49ec24c179
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_messaging/_drivers/amqp1_driver/controller.py
View File

@ -1245,6 +1245,7 @@ class Controller(pyngus.ConnectionEventHandler):
# service. Try to re-establish the connection: # service. Try to re-establish the connection:
if not self._reconnecting: if not self._reconnecting:
self._reconnecting = True self._reconnecting = True
self.processor.wakeup(lambda: self._hard_reset(reason))
LOG.info("Delaying reconnect attempt for %d seconds", LOG.info("Delaying reconnect attempt for %d seconds",
self._delay) self._delay)
self.processor.defer(lambda: self._do_reconnect(reason), self.processor.defer(lambda: self._do_reconnect(reason),
@ -1261,7 +1262,6 @@ class Controller(pyngus.ConnectionEventHandler):
""" """
self._reconnecting = False self._reconnecting = False
if not self._closing: if not self._closing:
self._hard_reset(reason)
host = self.hosts.next() host = self.hosts.next()
LOG.info("Reconnecting to: %(hostname)s:%(port)s", LOG.info("Reconnecting to: %(hostname)s:%(port)s",
{'hostname': host.hostname, 'port': host.port}) {'hostname': host.hostname, 'port': host.port})
@ -1331,4 +1331,5 @@ class Controller(pyngus.ConnectionEventHandler):
def _active(self): def _active(self):
# Is the connection up # Is the connection up
return (self._socket_connection and return (self._socket_connection and
self._socket_connection.pyngus_conn and
self._socket_connection.pyngus_conn.active) self._socket_connection.pyngus_conn.active)