Fix Service Retirement requests leaving the Service as 'retiring'. #530
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
Pull Request Test Coverage Report for Build 3018
💛 - Coveralls |
Pull Request Test Coverage Report for Build 3132
💛 - Coveralls |
billfitzgerald0120
force-pushed
the
retire_api
branch
from
403306f
to
cb681f9
Compare
billfitzgerald0120
changed the title
|
Start_retirement is an old style method with no spec. I don't think it makes sense to build an old style spec for the old method. I'm going to followup with a PR to refactor the method and add a spec test. |
lfu
reviewed
May 14, 2019
| $evm.log(:error, "The old style retirement is incompatible with the new retirement state machine.") | ||
| exit(MIQ_ABORT) | ||
| end | ||
| end |
There was a problem hiding this comment.
Should this be:
unless $evm.root['service_retire_task']
$evm.log(:error, "Service retire task not found")
$evm.log(:error, "The old style retirement is incompatible with the new retirement state machine.")
exit(MIQ_ABORT)
end
This check should be placed before $evm.create_notification(:type => :service_retiring, :subject => service)
billfitzgerald0120
force-pushed
the
retire_api
branch
from
cb681f9
to
9e1f8b1
Compare
|
@lfu Made changes as you requested, please review. |
lfu
reviewed
May 23, 2019
| @@ -20,6 +20,14 @@ | |||
| exit MIQ_ABORT | |||
| end | |||
|
|
|||
| $evm.root['service_retire_task'].tap do |task| | |||
billfitzgerald0120
force-pushed
the
retire_api
branch
from
9e1f8b1
to
5bacade
Compare
…tiring'. This will fix the problem when someone uses the older api call and leaves the service in a 'retiring' state. If there is no task, the process is aborted and the state is 'initializing'. This will allow the retirement process will start again instead of being denied because the state is 'retiring' fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1698480 Updated update_service_retirement_status_spec Moved check for service_retire_task before notification as requested. Removed tap and changed code as requested Changed 'fred' to 'active' as requested
billfitzgerald0120
force-pushed
the
retire_api
branch
from
5bacade
to
8b95631
Compare
|
Checked commit billfitzgerald0120@8b95631 with ruby 2.3.3, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0 |
lfu
approved these changes
May 23, 2019
tinaafitz
approved these changes
May 23, 2019
|
@billfitzgerald0120 |
|
@miq-bot add_label hammer/yes |
simaishi
pushed a commit
that referenced
this pull request
May 23, 2019
Fix Service Retirement requests leaving the Service as 'retiring'. (cherry picked from commit ac0a57a) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1713477
|
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.
This will fix the problem when someone uses the older api call and leaves the service in a 'retiring' state.
If there is no task, the process is aborted and the state is 'initializing'.
This will allow the retirement process will start again instead of being denied because the state is 'retiring'
fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1698480
@miq-bot add_label bug
@miq-bot assign @tinaafitz
Start_retirement is an old style method with no spec. I don't think it makes sense to build an old style spec for the old method. I would like to followup this PR with a PR that refactors the method and I will build a spec for that.