Merge pull request #45 from cloudblue/fix_max_connect_attemps_reached

Fix exit on max connection attemps reached

Author: marcserrat

.github/workflows/deploy.yml

@@ -54,7 +54,6 @@ jobs:
       with:
         images: cloudblueconnect/connect-extension-runner
         tags: |
-          type=semver,pattern={{version}},value=${{ steps.tag.outputs.result }}.0
           type=semver,pattern={{major}}.{{minor}},value=${{ steps.tag.outputs.result }}.0
           type=semver,pattern={{major}},value=${{ steps.tag.outputs.result }}.0
         flavor: |

connect/eaas/worker.py

@@ -199,6 +199,11 @@ async def run(self):  # noqa: CCR001
                         continue
                     await self.process_message(message)
             except (ConnectionClosedOK, StopBackoffError):
+                self.run_event.set()
+                break
+            except (CommunicationError, MaintenanceError):
+                logger.error('Max connection attemps reached, exit.')
+                self.run_event.set()
                 break
             except ConnectionClosedError:
                 logger.warning(

tests/test_worker.py

@@ -1180,3 +1180,25 @@ async def test_ensure_connection_exit_backoff(mocker, caplog):
             await task
 
     assert 'Worker exiting, stop backoff loop' in caplog.text
+
+
+@pytest.mark.asyncio
+async def test_ensure_connection_exit_max_attemps(mocker, caplog):
+    mocker.patch('connect.eaas.handler.get_extension_class')
+    mocker.patch('connect.eaas.handler.get_extension_type')
+    mocker.patch('connect.eaas.worker.MAX_RETRY_TIME_GENERIC_SECONDS', 10)
+    mocker.patch('connect.eaas.worker.MAX_RETRY_DELAY_TIME_SECONDS', 1)
+    mocker.patch(
+        'connect.eaas.worker.websockets.connect',
+        side_effect=RuntimeError('generic error'),
+    )
+
+    worker = Worker()
+    worker.run_event.set()
+    worker.get_url = lambda: 'ws://test'
+
+    with caplog.at_level(logging.ERROR):
+        task = asyncio.create_task(worker.run())
+        await task
+
+    assert 'Max connection attemps reached, exit.' in caplog.text