ongoing

Author: sanderegg

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

@@ -10,7 +10,6 @@
 from ..resource_manager.registry import (
     RedisResourceRegistry,
 )
-from ._core_guests import remove_guest_user_with_all_its_resources
 from .settings import GUEST_USER_RC_LOCK_FORMAT
 
 _logger = logging.getLogger(__name__)
@@ -32,15 +31,12 @@ async def remove_disconnected_user_resources(
     #     - "resources" is a hash toto keep project and websocket ids
     #
 
-    _, all_sessions_dead = await registry.get_all_resource_keys()
-    _logger.debug("potential dead keys: %s", all_sessions_dead)
+    _, dead_user_sessions = await registry.get_all_resource_keys()
+    _logger.debug("potential dead keys: %s", dead_user_sessions)
 
     # clean up all resources of expired keys
-    for dead_session in all_sessions_dead:
-        try:
-            user_id = int(dead_session["user_id"])
-        except (KeyError, ValueError):
-            continue
+    for dead_session in dead_user_sessions:
+        user_id = int(dead_session["user_id"])
 
         if await lock_manager.lock(
             GUEST_USER_RC_LOCK_FORMAT.format(user_id=user_id)
@@ -108,13 +104,6 @@ async def remove_disconnected_user_resources(
                         err,
                     )
 
-                # 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,
-                    user_id=user_id,
-                )
-
             # (2) remove resource field in collected keys since (1) is completed
             _logger.info(
                 "(2) Removing field for released resource %s:%s from registry keys: %s",

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

@@ -240,8 +240,3 @@ async def remove_users_manually_marked_as_guests(
             app=app,
             user_id=guest_user_id,
         )
-
-        await remove_guest_user_with_all_its_resources(
-            app=app,
-            user_id=guest_user_id,
-        )

services/web/server/tests/unit/with_dbs/04/garbage_collector/conftest.py

@@ -0,0 +1,32 @@
+import pytest
+
+
+@pytest.fixture(scope="session")
+def fast_service_deletion_delay() -> int:
+    """
+    Returns the delay in seconds for fast service deletion.
+    This is used to speed up tests that involve service deletion.
+    """
+    return 1
+
+
+@pytest.fixture
+def app_environment(
+    fast_service_deletion_delay: int,
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: EnvVarsDict,
+) -> EnvVarsDict:
+    # NOTE: undos some app_environment settings
+    monkeypatch.delenv("WEBSERVER_GARBAGE_COLLECTOR", raising=False)
+    app_environment.pop("WEBSERVER_GARBAGE_COLLECTOR", None)
+
+    return app_environment | setenvs_from_dict(
+        monkeypatch,
+        {
+            "WEBSERVER_COMPUTATION": "1",
+            "WEBSERVER_NOTIFICATIONS": "1",
+            # sets TTL of a resource after logout
+            "RESOURCE_MANAGER_RESOURCE_TTL_S": f"{fast_service_deletion_delay}",
+            "GARBAGE_COLLECTOR_INTERVAL_S": "30",
+        },
+    )