Use task cancelation_status to trigger cancelation #457
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@miq-bot add-label transformation, enhancement, hammer/yes |
|
@miq-bot add-label blocker |
|
@mkanoor @gmcculloug could you please review ? |
gmcculloug
reviewed
Nov 5, 2018
| @@ -139,7 +139,7 @@ def main | |||
| if @handle.root['ae_state_step'] == 'on_error' | |||
| task.message = 'Failed' | |||
| create_cleanup_request(task) | |||
| elsif task.get_option('cancel_requested') && task.get_option(:cleanup_request_id).blank? | |||
| elsif task.cancelation_status == 'cancel_requested' && task.get_option(:cleanup_request_id).blank? | |||
There was a problem hiding this comment.
Don't hard-code the status strings. Use the defined methods:
expose :cancel_requested?
expose :canceling?
expose :canceled?
gmcculloug
suggested changes
Nov 5, 2018
|
Checked commits fabiendupont/manageiq-content@ace9b52~...1af9186 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
gmcculloug
approved these changes
Nov 6, 2018
simaishi
pushed a commit
that referenced
this pull request
Nov 6, 2018
Use task cancelation_status to trigger cancelation (cherry picked from commit 2160a0e) https://bugzilla.redhat.com/show_bug.cgi?id=1614864
|
Hammer backport details: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To prevent cancel_request option override, ManageIQ/manageiq#17825 introduced an attribute to the task object. This PR changes the Automate code to rely on this attribute.
Associated RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1614864