Skip to content
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

Clear Scylla Manager task errors from status after they've been successfully executed #1933

Merged
merged 1 commit into from
May 22, 2024
+29 −4
Merged

Clear Scylla Manager task errors from status after they've been successfully executed #1933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 29 additions & 4 deletions pkg/controller/manager/sync_action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,12 @@ type deleteTaskAction struct {
func (a *deleteTaskAction) Execute(ctx context.Context, client *managerclient.Client, status *scyllav1.ScyllaClusterStatus) error {
err := a.stopAndDeleteTask(ctx, client)
if err != nil {
updateTaskStatusError(a.taskType, a.taskName, messageOf(err), status)
setTaskStatusError(a.taskType, a.taskName, messageOf(err), status)
return fmt.Errorf("can't stop and delete task %q: %w", a.taskName, err)
}

clearTaskStatusError(a.taskType, a.taskName, status)

return nil
}

Expand Down Expand Up @@ -401,10 +403,12 @@ func (a *addTaskAction) String() string {
func (a *addTaskAction) Execute(ctx context.Context, client *managerclient.Client, status *scyllav1.ScyllaClusterStatus) error {
_, err := client.CreateTask(ctx, a.clusterID, a.task)
if err != nil {
updateTaskStatusError(a.task.Type, a.task.Name, messageOf(err), status)
setTaskStatusError(a.task.Type, a.task.Name, messageOf(err), status)
return fmt.Errorf("can't create task %q: %w", a.task.Name, err)
}

clearTaskStatusError(a.task.Type, a.task.Name, status)

return nil
}

Expand All @@ -420,10 +424,12 @@ func (a *updateTaskAction) String() string {
func (a *updateTaskAction) Execute(ctx context.Context, client *managerclient.Client, status *scyllav1.ScyllaClusterStatus) error {
err := client.UpdateTask(ctx, a.clusterID, a.task)
if err != nil {
updateTaskStatusError(a.task.Type, a.task.Name, messageOf(err), status)
setTaskStatusError(a.task.Type, a.task.Name, messageOf(err), status)
return fmt.Errorf("can't update task %q: %w", a.task.Name, err)
}

clearTaskStatusError(a.task.Type, a.task.Name, status)

return nil
}

Expand All @@ -439,7 +445,26 @@ func messageOf(err error) string {
return err.Error()
}

func updateTaskStatusError(taskType string, taskName string, taskErr string, status *scyllav1.ScyllaClusterStatus) {
func clearTaskStatusError(taskType string, taskName string, status *scyllav1.ScyllaClusterStatus) {
switch taskType {
case managerclient.RepairTask:
_, i, ok := slices.Find(status.Repairs, func(rts scyllav1.RepairTaskStatus) bool {
return rts.Name == taskName
})
if ok {
status.Repairs[i].Error = nil
}
case managerclient.BackupTask:
_, i, ok := slices.Find(status.Backups, func(bts scyllav1.BackupTaskStatus) bool {
return bts.Name == taskName
})
if ok {
status.Backups[i].Error = nil
}
}
}

func setTaskStatusError(taskType string, taskName string, taskErr string, status *scyllav1.ScyllaClusterStatus) {
switch taskType {
case managerclient.RepairTask:
rts := scyllav1.RepairTaskStatus{
Expand Down