Skip to content

Commit

Permalink
fix: avoid checking max_vfolder_count (#1397)
Browse files Browse the repository at this point in the history
Co-authored-by: Joongi Kim <joongi@lablup.com>
Backported-from: main
Backported-to: 22.09
  • Loading branch information
pderer and achimnol committed Aug 29, 2023
1 parent 8dab279 commit 2d082f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions changes/1397.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow projcet vfolder creation regardless of the user (keypair) vfolder count limit
4 changes: 2 additions & 2 deletions src/ai/backend/manager/api/vfolder.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ async def create(request: web.Request, params: Any) -> web.Response:
resource_policy = request["keypair"]["resource_policy"]
domain_name = request["user"]["domain_name"]
group_id_or_name = params["group"]
ownership_type = "group" if group_id_or_name else "user"
log.info(
"VFOLDER.CREATE (email:{}, ak:{}, vf:{}, vfh:{}, umod:{}, perm:{})",
request["user"]["email"],
Expand Down Expand Up @@ -385,7 +386,7 @@ async def create(request: web.Request, params: Any) -> web.Response:
if resource_policy["max_vfolder_count"] > 0:
query = sa.select([sa.func.count()]).where(vfolders.c.user == user_uuid)
result = await conn.scalar(query)
if result >= resource_policy["max_vfolder_count"]:
if result >= resource_policy["max_vfolder_count"] and ownership_type == "user":
raise InvalidAPIParameters("You cannot create more vfolders.")

# Limit vfolder size quota if it is larger than max_vfolder_size of the resource policy.
Expand Down Expand Up @@ -447,7 +448,6 @@ async def create(request: web.Request, params: Any) -> web.Response:
raise VFolderCreationFailed
user_uuid = str(user_uuid) if group_id is None else None
group_uuid = str(group_id) if group_id is not None else None
ownership_type = "group" if group_uuid is not None else "user"
insert_values = {
"id": folder_id.hex,
"name": params["name"],
Expand Down

0 comments on commit 2d082f1

Please sign in to comment.