Merge pull request #16299 from mvdbeek/fix_recalculate_disk_without_c…

…elery [23.1] Fix recalculate_quota throug kombu message
galaxyproject · Jun 23, 2023 · 8600bfb · 8600bfb
2 parents 90a830a + 284c19a
commit 8600bfb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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,
                 },
             )