CODENVY-1403: fix bug in machine removal #4154
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
Bug occurs when container is unavailable without stop of machine. In that case we don't stop machine instance and not cleanup resources. Signed-off-by: Alexander Garagatyi
garagatyi
added
the
kind/bug
mshaposhnik
reviewed
Feb 16, 2017
| .withError(message); | ||
|
|
||
| try { | ||
| if (!Strings.isNullOrEmpty(message)) { |
There was a problem hiding this comment.
How it can became empty ??
There was a problem hiding this comment.
😄 copied from older code. Good catch!
voievodin
reviewed
Feb 16, 2017
| @@ -158,7 +160,12 @@ public CheEnvironmentEngine(SnapshotDao snapshotDao, | |||
| "/recipe/.*$)|(^/recipe/.*$)"); | |||
| this.containerNameGenerator = containerNameGenerator; | |||
|
|
|||
| eventService.subscribe(new MachineCleaner()); | |||
| eventService.subscribe(event -> { | |||
There was a problem hiding this comment.
Can you please subscribe outside the constructor e.g.
@PostConstruct
private void subscribe() {
eventSubscriber.subscribe(...)
}As you implicitly expose instance which hasn't been fully constructed yet
voievodin
reviewed
Feb 16, 2017
| "MB. Create a new machine configuration that allocates additional RAM or increase " + | ||
| "the workspace RAM limit in the user dashboard."; | ||
| } | ||
| MachineStatusEvent destroyedEvent = newDto(MachineStatusEvent.class) |
There was a problem hiding this comment.
What if we move this event to the place where it's published
eventService.publish(newDto(...));
mshaposhnik
approved these changes
Feb 16, 2017
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1984/ |
added 2 commits
February 16, 2017 16:02
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
… Alexander Garagatyi <agaragatyi@codenvy.com>
skabashnyuk
approved these changes
Feb 16, 2017
|
@mshaposhnik @evoevodin I updated PR |
voievodin
approved these changes
Feb 16, 2017
mmorhun
approved these changes
Feb 16, 2017
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1987/ |
9 tasks
JPinkney
pushed a commit
to JPinkney/che
that referenced
this pull request
Aug 17, 2017
Bug occurs when container is unavailable without stop of machine. In that case we don't stop machine instance and not cleanup resources. Signed-off-by: Alexander Garagatyi
This pull request was closed.
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.
What does this PR do?
Fix bug in machine removal.
Bug occurs when container is unavailable without stop of machine.
In that case we don't stop machine instance and not cleanup
resources.
What issues does this PR fix or reference?
Related to codenvy/codenvy#1403
Changelog
Fix machine stop in case docker container was stopped or killed not by Codenvy.
Release Notes
Docs PR