Catches all db errors

Author: pcrespov

services/web/server/src/simcore_service_webserver/resource_manager/garbage_collector.py

@@ -4,6 +4,7 @@
 from itertools import chain
 from typing import Dict, List, Optional, Tuple
 
+import asyncpg.exceptions
 import psycopg2
 from aiohttp import web
 from aioredlock import Aioredlock
@@ -49,6 +50,7 @@
 from .registry import RedisResourceRegistry, get_registry
 
 logger = logging.getLogger(__name__)
+database_errors = (psycopg2.DatabaseError, asyncpg.exceptions.PostgresError)
 
 
 def setup_garbage_collector(app: web.Application):
@@ -60,11 +62,13 @@ async def _setup_background_task(app: web.Application):
 
         yield
 
+        logger.info("Stopping garbage collector...")
         # on_cleanup
         with suppress(asyncio.CancelledError):
             task = app[APP_GARBAGE_COLLECTOR_KEY]
             task.cancel()
             await task
+        logger.info("Garbage collector stopped")
 
     app.cleanup_ctx.append(_setup_background_task)
 
@@ -237,14 +241,15 @@ async def remove_disconnected_user_resources(
 
                 if resource_name == "project_id":
                     # inform that the project can be closed on the backend side
+                    # WARNING: slot functions can raise any exception
                     await emit(
                         event="SIGNAL_PROJECT_CLOSE",
                         user_id=None,
                         project_uuid=resource_value,
                         app=app,
                     )
 
-                # if this user was a GUEST also remove it from the database
+                # ONLY GUESTS: if this user was a GUEST also remove it from the database
                 # with the only associated project owned
                 await remove_guest_user_with_all_its_resources(
                     app=app,
@@ -377,7 +382,7 @@ async def remove_guest_user_with_all_its_resources(
         await remove_all_projects_for_user(app=app, user_id=user_id)
         await remove_user(app=app, user_id=user_id)
 
-    except psycopg2.DatabaseError:
+    except database_errors:
         logger.warning(
             "Could not remove GUEST with id=%s. Check the logs above for details",
             user_id,
@@ -572,7 +577,7 @@ async def replace_current_owner(
             app=app, primary_gid=int(new_project_owner_gid)
         )
 
-    except psycopg2.DatabaseError:
+    except database_errors:
         logger.exception(
             "Could not recover new user id from gid %s", new_project_owner_gid
         )
@@ -600,7 +605,7 @@ async def replace_current_owner(
             project_data=project,
             project_uuid=project_uuid,
         )
-    except psycopg2.DatabaseError:
+    except database_errors:
         logger.exception(
             "Could not remove old owner and replaced it with user %s",
             new_project_owner_id,
@@ -611,7 +616,7 @@ async def remove_user(app: web.Application, user_id: int) -> None:
     """Tries to remove a user, if the users still exists a warning message will be displayed"""
     try:
         await delete_user(app, user_id)
-    except psycopg2.DatabaseError:
+    except database_errors:
         logger.warning(
             "User '%s' still has some projects, could not be deleted", user_id
         )