Skip to content

Commit b5affba

Browse files
committed
replace 'gids' column with ('main_gid' and 'additional_gids')
1 parent 21419e9 commit b5affba

File tree

3 files changed

+29
-6
lines changed

3 files changed

+29
-6
lines changed

src/ai/backend/manager/models/alembic/versions/f6ca2f2d04c1_add_uid_and_gid_columns.py

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ def upgrade() -> None:
2222
)
2323
op.add_column(
2424
"kernels",
25-
sa.Column("gids", sa.ARRAY(sa.Integer()), server_default=sa.text("NULL"), nullable=True),
25+
sa.Column("main_gid", sa.Integer(), server_default=sa.text("NULL"), nullable=True),
26+
)
27+
op.add_column(
28+
"kernels",
29+
sa.Column(
30+
"additional_gids", sa.ARRAY(sa.Integer()), server_default=sa.text("NULL"), nullable=True
31+
),
2632
)
2733
op.add_column(
2834
"users",
@@ -31,13 +37,24 @@ def upgrade() -> None:
3137
op.add_column(
3238
"users",
3339
sa.Column(
34-
"container_gids", sa.ARRAY(sa.Integer()), server_default=sa.text("NULL"), nullable=True
40+
"container_main_gid", sa.Integer(), server_default=sa.text("NULL"), nullable=True
41+
),
42+
)
43+
op.add_column(
44+
"users",
45+
sa.Column(
46+
"container_additional_gids",
47+
sa.ARRAY(sa.Integer()),
48+
server_default=sa.text("NULL"),
49+
nullable=True,
3550
),
3651
)
3752

3853

3954
def downgrade() -> None:
40-
op.drop_column("users", "container_gids")
55+
op.drop_column("users", "container_main_gid")
56+
op.drop_column("users", "container_additional_gids")
4157
op.drop_column("users", "container_uid")
42-
op.drop_column("kernels", "gids")
58+
op.drop_column("kernels", "additional_gids")
59+
op.drop_column("kernels", "main_gid")
4360
op.drop_column("kernels", "uid")

src/ai/backend/manager/models/kernel.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,10 @@ class KernelRow(Base):
417417
"cluster_hostname", sa.String(length=64), nullable=False, default=default_hostname
418418
)
419419
uid = sa.Column("uid", sa.Integer, nullable=True, server_default=sa.null())
420-
gids = sa.Column("gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null())
420+
main_gid = sa.Column("main_gid", sa.Integer, nullable=True, server_default=sa.null())
421+
additional_gids = sa.Column(
422+
"additional_gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null()
423+
)
421424

422425
# Resource ownership
423426
scaling_group = sa.Column(

src/ai/backend/manager/models/user.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ class UserStatus(enum.StrEnum):
160160
nullable=True, # keypairs.user is non-nullable
161161
),
162162
sa.Column("container_uid", sa.Integer, nullable=True, server_default=sa.null()),
163-
sa.Column("container_gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null()),
163+
sa.Column("container_main_gid", sa.Integer, nullable=True, server_default=sa.null()),
164+
sa.Column(
165+
"container_additional_gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null()
166+
),
164167
)
165168

166169

0 commit comments

Comments
 (0)