From b92c183022834f97cbf58fb54811fe5342f0440a Mon Sep 17 00:00:00 2001 From: rkuo-danswer Date: Fri, 3 Jan 2025 14:35:56 -0800 Subject: [PATCH] re-prep user group deletion on the actual deletion (#3588) * re-prep user group deletion on the actual deletion * user group needs to be synced to be prepped --------- Co-authored-by: Richard Kuo (Danswer) --- .../ee/onyx/background/celery/tasks/vespa/tasks.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/ee/onyx/background/celery/tasks/vespa/tasks.py b/backend/ee/onyx/background/celery/tasks/vespa/tasks.py index 4d4e94c1b635..bd6cd4c9f0b1 100644 --- a/backend/ee/onyx/background/celery/tasks/vespa/tasks.py +++ b/backend/ee/onyx/background/celery/tasks/vespa/tasks.py @@ -6,6 +6,7 @@ from sqlalchemy.orm import Session from ee.onyx.db.user_group import delete_user_group from ee.onyx.db.user_group import fetch_user_group from ee.onyx.db.user_group import mark_user_group_as_synced +from ee.onyx.db.user_group import prepare_user_group_for_deletion from onyx.background.celery.apps.app_base import task_logger from onyx.redis.redis_usergroup import RedisUserGroup from onyx.utils.logger import setup_logger @@ -46,11 +47,20 @@ def monitor_usergroup_taskset( user_group = fetch_user_group(db_session=db_session, user_group_id=usergroup_id) if user_group: + usergroup_name = user_group.name if user_group.is_up_for_deletion: + # this prepare should have been run when the deletion was scheduled, + # but run it again to be sure we're ready to go + mark_user_group_as_synced(db_session, user_group) + prepare_user_group_for_deletion(db_session, usergroup_id) delete_user_group(db_session=db_session, user_group=user_group) - task_logger.info(f"Deleted usergroup. id='{usergroup_id}'") + task_logger.info( + f"Deleted usergroup: name={usergroup_name} id={usergroup_id}" + ) else: mark_user_group_as_synced(db_session=db_session, user_group=user_group) - task_logger.info(f"Synced usergroup. id='{usergroup_id}'") + task_logger.info( + f"Synced usergroup. name={usergroup_name} id={usergroup_id}" + ) rug.reset()