Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[23.1] Fix recalculate_quota throug kombu message #16299

Merged
merged 1 commit into from Jun 23, 2023
Merged

[23.1] Fix recalculate_quota throug kombu message #16299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/galaxy/queue_worker.py
View file
Open in desktop
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion lib/galaxy/webapps/galaxy/services/users.py
View file
Open in desktop
Expand Up @@ -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,
},
)
Expand Down