Skip to content

Commit

Permalink
skip querying deleted vfolders when purge user
Browse files Browse the repository at this point in the history
  • Loading branch information
fregataa committed Jan 8, 2025
1 parent 368fdd6 commit d10dd16
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions src/ai/backend/manager/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,13 @@ async def delete_vfolders(
:return: number of deleted rows
"""
from . import VFolderDeletionInfo, initiate_vfolder_deletion, vfolder_permissions, vfolders
from . import (
VFolderDeletionInfo,
VFolderOperationStatus,
initiate_vfolder_deletion,
vfolder_permissions,
vfolders,
)

async with engine.begin_session() as conn:
await conn.execute(
Expand All @@ -1116,7 +1122,16 @@ async def delete_vfolders(
result = await conn.execute(
sa.select([vfolders.c.id, vfolders.c.host, vfolders.c.quota_scope_id])
.select_from(vfolders)
.where(vfolders.c.user == user_uuid),
.where(
sa.and_(
vfolders.c.user == user_uuid,
vfolders.c.status.not_in(
VFolderOperationStatus.DELETE_ONGOING,
VFolderOperationStatus.DELETE_COMPLETE,
VFolderOperationStatus.DELETE_ERROR,
),
)
),
)
target_vfs = result.fetchall()

Expand Down

0 comments on commit d10dd16

Please sign in to comment.