From 284c19ad91438f4593f19d1a8ef423f645f53643 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 22 Jun 2023 22:01:57 +0200 Subject: [PATCH] Fix recalculate_quota throug kombu message Fixes https://github.com/galaxyproject/galaxy/issues/16298 --- lib/galaxy/queue_worker.py | 5 +---- lib/galaxy/webapps/galaxy/services/users.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/galaxy/queue_worker.py b/lib/galaxy/queue_worker.py index 144409790ed0..6bc02aa4005c 100644 --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -216,15 +216,12 @@ def reload_sanitize_allowlist(app): def recalculate_user_disk_usage(app, **kwargs): - object_store = kwargs.get("object_store", None) user_id = kwargs.get("user_id", None) sa_session = app.model.context - if object_store is None: - log.error("Recalculate user disk usage task received without object_store.") if user_id: user = sa_session.query(app.model.User).get(user_id) if user: - user.calculate_and_set_disk_usage(object_store) + user.calculate_and_set_disk_usage(app.object_store) else: log.error(f"Recalculate user disk usage task failed, user {user_id} not found") else: diff --git a/lib/galaxy/webapps/galaxy/services/users.py b/lib/galaxy/webapps/galaxy/services/users.py index c96cd0e7c2eb..15b5dcedf94c 100644 --- a/lib/galaxy/webapps/galaxy/services/users.py +++ b/lib/galaxy/webapps/galaxy/services/users.py @@ -41,7 +41,6 @@ def recalculate_disk_usage( trans.app, "recalculate_user_disk_usage", kwargs={ - "object_store": trans.app.object_store, "user_id": trans.user.id, }, )