diff options
author | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2015-03-19 09:33:00 +0100 |
---|---|---|
committer | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2015-03-24 17:34:55 +0100 |
commit | b5f91b2167f9c5a32620ebf7c62a9865ed125070 (patch) | |
tree | 93f17f005662623efc0aeaca51ab85923a1342f1 | |
parent | ac8bdb634c36c834a27cfa226f591fad86acbfdd (diff) | |
download | oslo-messaging-b5f91b2167f9c5a32620ebf7c62a9865ed125070.tar.gz |
Reconnect on connection lost in heartbeat thread
During the log refactoring of the big heartbeat patch,
one line have been squashed (line 936):
https://review.openstack.org/#/c/146047/29..30/oslo_messaging/_drivers/impl_rabbit.py
This change reintroduces it, and improve the test to cover it.
Change-Id: I5e7162f37527580c14a809f9945114dc81451c1a
(cherry picked from commit cc618a42db8ba6249288efab9af8b87cc282c432)
-rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 1 | ||||
-rw-r--r-- | oslo_messaging/tests/drivers/test_impl_rabbit.py | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index b24e67a..08e556b 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -951,6 +951,7 @@ class Connection(object): except recoverable_errors as exc: LOG.info(_LI("A recoverable connection/channel error " "occurred, trying to reconnect: %s"), exc) + self.ensure_connection() except Exception: LOG.exception(_LE("Unexpected error during heartbeart " "thread processing, retrying...")) diff --git a/oslo_messaging/tests/drivers/test_impl_rabbit.py b/oslo_messaging/tests/drivers/test_impl_rabbit.py index 3f3145f..dacb40a 100644 --- a/oslo_messaging/tests/drivers/test_impl_rabbit.py +++ b/oslo_messaging/tests/drivers/test_impl_rabbit.py @@ -62,7 +62,10 @@ class TestHeartbeat(test_utils.BaseTestCase): @mock.patch('kombu.connection.Connection.heartbeat_check') @mock.patch('oslo_messaging._drivers.impl_rabbit.Connection.' '_heartbeat_supported_and_enabled', return_value=True) - def _do_test_heartbeat_sent(self, fake_heartbeat_support, fake_heartbeat, + @mock.patch('oslo_messaging._drivers.impl_rabbit.Connection.' + 'ensure_connection') + def _do_test_heartbeat_sent(self, fake_ensure_connection, + fake_heartbeat_support, fake_heartbeat, fake_logger, heartbeat_side_effect=None, info=None): @@ -79,6 +82,7 @@ class TestHeartbeat(test_utils.BaseTestCase): 'kombu+memory:////') self.addCleanup(transport.cleanup) conn = transport._driver._get_connection() + conn.ensure(method=lambda: True) event.wait() conn._heartbeat_stop() @@ -86,8 +90,10 @@ class TestHeartbeat(test_utils.BaseTestCase): self.assertLess(0, fake_heartbeat.call_count) if not heartbeat_side_effect: + self.assertEqual(1, fake_ensure_connection.call_count) self.assertEqual(2, fake_logger.info.call_count) else: + self.assertEqual(2, fake_ensure_connection.call_count) self.assertEqual(3, fake_logger.info.call_count) self.assertIn(mock.call(info, mock.ANY), fake_logger.info.mock_calls) |