Skip to content

Adding checks for rescued tasks during reconciliation #3650

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 2 commits into from
Aug 11, 2020
Merged

Adding checks for rescued tasks during reconciliation #3650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ca0d0
Stopping reconciliation on rescue
VenkatRamaraju Aug 4, 2020
eb541b7
Added error check
VenkatRamaraju Aug 5, 2020
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
2 changes: 1 addition & 1 deletion internal/ansible/controller/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
return reconcile.Result{}, err
}
}
if event.Event == eventapi.EventRunnerOnFailed && !event.IgnoreError() {
if event.Event == eventapi.EventRunnerOnFailed && !event.IgnoreError() && !event.Rescued() {
failureMessages = append(failureMessages, event.GetFailedPlaybookMessage())
}
}
Expand Down
12 changes: 12 additions & 0 deletions internal/ansible/runner/eventapi/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,15 @@ func (je JobEvent) IgnoreError() bool {
}
return false
}

// Rescued - Detects whether or not a task was rescued
func (je JobEvent) Rescued() bool {
if rescued, contains := je.EventData["rescued"]; contains {
for _, v := range rescued.(map[string]interface{}) {
if int(v.(float64)) == 1 {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a drive-by comment :) but I happened to look at this PR and wondered -- is it always the case that "rescued" will only ever be 0 or 1? Is it possible multiple tasks could be rescued and thus this count could be 2, or 3, or ???

In which case, wouldn't it be more correct to say:

if int(v.(float64)) >= 1

return true
}
}
}
return false
}