Skip to content

[CLUST-348] remove Slurm accounts when archiving groups #184

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
Kyle9410-Chen merged 3 commits into from
Aug 27, 2026
Merged

[CLUST-348] remove Slurm accounts when archiving groups #184

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86a2d2b
feat: delete Slurm accounts when archiving a group
joegoooo Aug 19, 2026
177567f
feat: create Slurm accounts when unarchiving a group
joegoooo Aug 19, 2026
a26adbe
refactor: add explanatory comment for Slurm account deletion order in…
joegoooo Aug 19, 2026
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
109 changes: 109 additions & 0 deletions internal/group/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,70 @@ func (s *Service) Archive(ctx context.Context, groupID uuid.UUID) (Group, error)
})
}

// Tear down the group's Slurm account tree children-first — slurmdbd
// refuses to delete an account that still has child associations.
slurmBaseAccount := slurm.BaseAccountName(baseCN)

saga.AddStep(internal.SagaStep{
Name: "DeleteSlurmAdminAccount",
Action: func(ctx context.Context) error {
err := s.slurmStore.DeleteAccount(ctx, adminCN)
if err != nil {
logger.Error("failed to delete admin account in Slurm", zap.Error(err))
span.RecordError(err)
return err
}
return nil
},
Compensate: func(ctx context.Context) error {
_, err := s.slurmStore.CreateAccountAssociation(ctx, []string{adminCN}, nil, baseCN)
if err != nil {
logger.Error("failed to compensate for creating admin account in Slurm", zap.Error(err))
}
return err
},
})

saga.AddStep(internal.SagaStep{
Name: "DeleteSlurmBaseAccount",
Action: func(ctx context.Context) error {
err := s.slurmStore.DeleteAccount(ctx, slurmBaseAccount)
if err != nil {
logger.Error("failed to delete base account in Slurm", zap.Error(err))
span.RecordError(err)
return err
}
return nil
},
Compensate: func(ctx context.Context) error {
_, err := s.slurmStore.CreateAccountAssociation(ctx, []string{slurmBaseAccount}, nil, baseCN)
if err != nil {
logger.Error("failed to compensate for creating base account in Slurm", zap.Error(err))
}
return err
},
})

saga.AddStep(internal.SagaStep{
Name: "DeleteSlurmTopAccount",
Action: func(ctx context.Context) error {
err := s.slurmStore.DeleteAccount(ctx, baseCN)
if err != nil {
logger.Error("failed to delete top-level account in Slurm", zap.Error(err))
span.RecordError(err)
return err
}
return nil
},
Compensate: func(ctx context.Context) error {
_, err := s.slurmStore.CreateAccountAssociation(ctx, []string{baseCN}, nil, "")
if err != nil {
logger.Error("failed to compensate for creating top-level account in Slurm", zap.Error(err))
}
return err
},
})

err = saga.Execute(traceCtx)
if err != nil {
s.logger.Error("saga execution failed", zap.Error(err))
Expand Down Expand Up @@ -1117,6 +1181,51 @@ func (s *Service) Unarchive(ctx context.Context, groupID uuid.UUID) (Group, erro
},
})

slurmBaseAccount := slurm.BaseAccountName(baseCN)

saga.AddStep(internal.SagaStep{
Name: "CreateSlurmTopAccount",
Action: func(ctx context.Context) error {
_, err := s.slurmStore.CreateAccountAssociation(ctx, []string{baseCN}, nil, "")
if err != nil {
logger.Error("failed to create top-level account in Slurm", zap.Error(err))
span.RecordError(err)
return err
}
return nil
},
Compensate: func(ctx context.Context) error {
err := s.slurmStore.DeleteAccount(ctx, baseCN)
if err != nil {
logger.Error("failed to delete top-level account in Slurm", zap.Error(err))
}
return err
},
})

saga.AddStep(internal.SagaStep{
Name: "CreateSlurmChildAccounts",
Action: func(ctx context.Context) error {
_, err := s.slurmStore.CreateAccountAssociation(ctx, []string{slurmBaseAccount, adminCN}, nil, baseCN)
if err != nil {
logger.Error("failed to create base/admin child accounts in Slurm", zap.Error(err))
span.RecordError(err)
return err
}
return nil
},
Compensate: func(ctx context.Context) error {
err := errors.Join(
s.slurmStore.DeleteAccount(ctx, adminCN),
s.slurmStore.DeleteAccount(ctx, slurmBaseAccount),
)
if err != nil {
logger.Error("failed to delete base/admin child accounts in Slurm", zap.Error(err))
}
return err
},
})

for _, member := range members {
saga.AddStep(internal.SagaStep{
Name: "AddUsersToLDAPGroup",
Expand Down
Loading