Skip to content

feat(BA-527): Add uid and gid columns to users and kernels tables #3278

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

Merged
merged 4 commits into from
Feb 3, 2025
Merged

feat(BA-527): Add uid and gid columns to users and kernels tables #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bd6ef6
feat: Add uid and gid columns to users and kernels tables
fregataa Dec 20, 2024
7c795df
replace 'gids' column with ('main_gid' and 'additional_gids')
fregataa Jan 2, 2025
1b24e22
rename additional_gids to gids for better readability
fregataa Jan 17, 2025
48756c2
resolve alembic multi version heads
fregataa Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions src/ai/backend/manager/models/alembic/versions/f6ca2f2d04c1_add_uid_and_gid_columns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
"""add uid and gid columns

Revision ID: f6ca2f2d04c1
Revises: fb89f5d7817b
Create Date: 2024-12-20 12:16:07.077845

"""

import sqlalchemy as sa
from alembic import op

# revision identifiers, used by Alembic.
revision = "f6ca2f2d04c1"
down_revision = "fb89f5d7817b"
branch_labels = None
depends_on = None


def upgrade() -> None:
op.add_column(
"kernels", sa.Column("uid", sa.Integer(), server_default=sa.text("NULL"), nullable=True)
)
op.add_column(
"kernels",
sa.Column("main_gid", sa.Integer(), server_default=sa.text("NULL"), nullable=True),
)
op.add_column(
"kernels",
sa.Column("gids", sa.ARRAY(sa.Integer()), server_default=sa.text("NULL"), nullable=True),
)
op.add_column(
"users",
sa.Column("container_uid", sa.Integer(), server_default=sa.text("NULL"), nullable=True),
)
op.add_column(
"users",
sa.Column(
"container_main_gid", sa.Integer(), server_default=sa.text("NULL"), nullable=True
),
)
op.add_column(
"users",
sa.Column(
"container_gids",
sa.ARRAY(sa.Integer()),
server_default=sa.text("NULL"),
nullable=True,
),
)


def downgrade() -> None:
op.drop_column("users", "container_main_gid")
op.drop_column("users", "container_gids")
op.drop_column("users", "container_uid")
op.drop_column("kernels", "gids")
op.drop_column("kernels", "main_gid")
op.drop_column("kernels", "uid")
4 changes: 4 additions & 0 deletions src/ai/backend/manager/models/kernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,10 @@ class KernelRow(Base):
cluster_hostname = sa.Column(
"cluster_hostname", sa.String(length=64), nullable=False, default=default_hostname
)
uid = sa.Column("uid", sa.Integer, nullable=True, server_default=sa.null())
main_gid = sa.Column("main_gid", sa.Integer, nullable=True, server_default=sa.null())
gids = sa.Column("gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null())

# Resource ownership
scaling_group = sa.Column(
"scaling_group", sa.ForeignKey("scaling_groups.name"), index=True, nullable=True
Expand Down
3 changes: 3 additions & 0 deletions src/ai/backend/manager/models/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ class UserStatus(enum.StrEnum):
sa.ForeignKey("keypairs.access_key", ondelete="SET NULL"),
nullable=True, # keypairs.user is non-nullable
),
sa.Column("container_uid", sa.Integer, nullable=True, server_default=sa.null()),
sa.Column("container_main_gid", sa.Integer, nullable=True, server_default=sa.null()),
sa.Column("container_gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null()),
)


Expand Down
Loading