fix orchestrated destroy #15339
Merged
fix orchestrated destroy #15339
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
durandom
approved these changes
Jun 8, 2017
|
cc @simon3z |
jrafanie
reviewed
Jun 8, 2017
app/models/ext_management_system.rb
Outdated
| @@ -449,8 +449,8 @@ def orchestrate_destroy | |||
| disable! if enabled? | |||
|
|
|||
| if self.destroy == false | |||
| _log.info("Cant #{self.class.name} with id: #{id}, workers still in progress. Requeuing destroy...") | |||
| schedule_destroy_queue(id, :deliver_on => 15.seconds.from_now) | |||
| _log.info("Cant destroy #{self.class.name} with id: #{id}, workers still in progress. Requeuing destroy...") | |||
There was a problem hiding this comment.
Can you change this to Cannot destroy or Not destroying...? Sorry I didn't see this before. Cant doesn't look right
zeari
force-pushed
the
orchestrate_destroy3
branch
from
8f33fb2 to
2661abd
Compare
fixed |
jrafanie
reviewed
Jun 12, 2017
app/models/ext_management_system.rb
Outdated
| @@ -449,8 +449,8 @@ def orchestrate_destroy | |||
| disable! if enabled? | |||
|
|
|||
| if self.destroy == false | |||
| _log.info("Cant #{self.class.name} with id: #{id}, workers still in progress. Requeuing destroy...") | |||
| schedule_destroy_queue(id, :deliver_on => 15.seconds.from_now) | |||
| _log.info("Cannot destroy destroy #{self.class.name} with id: #{id}, workers still in progress. Requeuing destroy...") | |||
There was a problem hiding this comment.
oops, sorry @zeari, there's one too many destroys here ^
zeari
force-pushed
the
orchestrate_destroy3
branch
from
2661abd to
bfd57a5
Compare
|
Checked commit zeari@bfd57a5 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
Sorry about that. fixed again. |
jrafanie
approved these changes
Jun 14, 2017
jrafanie
reviewed
Jun 14, 2017
| _log.info("Cant #{self.class.name} with id: #{id}, workers still in progress. Requeuing destroy...") | ||
| schedule_destroy_queue(id, :deliver_on => 15.seconds.from_now) | ||
| _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.
in the future, please add a test.
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.
Small fix to #14848
@jrafanie @durandom