Create a task when destroying an ems #16669
Merged
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
|
cc @blomquisg |
Fryguy
reviewed
Dec 14, 2017
app/models/ext_management_system.rb
Outdated
| ) | ||
| end | ||
|
|
||
| # Wait until all associated workers are dead to destroy this ems | ||
| def orchestrate_destroy | ||
| def orchestrate_destroy(task_id) | ||
| disable! if enabled? | ||
|
|
||
| if self.destroy == false | ||
| _log.info("Cannot destroy #{self.class.name} with id: #{id}, workers still in progress. Requeuing destroy...") | ||
| self.class.schedule_destroy_queue(id, 15.seconds.from_now) |
There was a problem hiding this comment.
Doesn't this have to change since you changed the signature of schedule_destroy_queue ?
Fryguy
reviewed
Dec 14, 2017
| expect(described_class).to receive(:schedule_destroy_queue).with(ems.id) | ||
| expect(described_class).to receive(:schedule_destroy_queue).with(child_manager.id) | ||
| expect(described_class).to receive(:schedule_destroy_queue).with(ems.id, Integer) | ||
| expect(described_class).to receive(:schedule_destroy_queue).with(child_manager.id, Integer) |
There was a problem hiding this comment.
I think you also need a test for rescheduling a destroy.
agrare
force-pushed
the
bz_1525498_create_task_when_deleting_provider
branch
6 times, most recently
from
a3b6ed2 to
1e0a9e2
Compare
agrare
force-pushed
the
bz_1525498_create_task_when_deleting_provider
branch
from
1e0a9e2 to
da3d5f4
Compare
When queueing a destroy on an EMS create a task and return the ID to be used by the caller to track when the destroy is complete. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525498
agrare
force-pushed
the
bz_1525498_create_task_when_deleting_provider
branch
from
da3d5f4 to
d74ee55
Compare
|
@blomquisg @Fryguy PTAL |
Fryguy
reviewed
Dec 20, 2017
| expect(described_class).to receive(:schedule_destroy_queue).with(ems.id) | ||
| expect(described_class).to receive(:schedule_destroy_queue).with(child_manager.id) | ||
| described_class.destroy_queue(ems.id) | ||
| def deliver_queue_message(queue_message = MiqQueue.first) |
There was a problem hiding this comment.
This can lead to sproadic test failures if there are multiple queue items, because .first is not guranteed to return in a particular order...prefer MiqQueue.order(:id).first
|
Checked commits agrare/manageiq@b9309e7~...fbd94fe with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0 |
simaishi
pushed a commit
that referenced
this pull request
Jan 3, 2018
…eting_provider Create a task when destroying an ems (cherry picked from commit 2b27e62) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530646
|
Gaprindashvili 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.
When queueing a destroy on an EMS create a task and return the ID to be
used by the caller to track when the destroy is complete.
Task page while destroy is running:
Task after destroy completes:
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525498