worker/undertaker: don't ignore all errors #7761
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
state/undertaker.go
Outdated
| // transitions the model to Dead. | ||
| // | ||
| // If the model is non-empty because it is the controller model and still | ||
| // contains hosted models, an error satisfying IsHasHostedModelsError wll |
There was a problem hiding this comment.
missing vowel in "will"
| // Error is part of the error interface. | ||
| func (e modelNotEmptyError) Error() string { | ||
| msg := "model not empty, found " | ||
| plural := func(n int, thing string) string { |
There was a problem hiding this comment.
Nice usability consideration :D
| if model.UUID() != st.ModelUUID() && model.Life() != Dead { | ||
| return nil, errors.Errorf("one or more hosted models are not yet dead") | ||
| } | ||
| if n := len(models) - 1; n > 0 { |
There was a problem hiding this comment.
AllModels() call above will return even those models that are already Dead. Do we want them to be part of this count?
There was a problem hiding this comment.
yes, per the comment I added: we shouldn't be able to mark the controller model as Dead until all hosted models are removed
The undertaker was ignoring all errors when attempting to transition a Dying model to Dead. This is wrong; we should only ignore a couple of specific errors relating to the contents of the model. After those errors are received, we'll retry. Other errors should cause the worker to restart. Possibly fixes https://bugs.launchpad.net/juju/+bug/1695894
axw
force-pushed
the
lp1695894-undertaker-dont-ignore-errors
branch
from
ebec1cf
to
bf0de30
Compare
anastasiamac
approved these changes
Aug 18, 2017
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
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.
Description of change
The undertaker was ignoring all errors when attempting
to transition a Dying model to Dead. This is wrong; we
should only ignore a couple of specific errors relating
to the contents of the model. After those errors are
received, we'll retry. Other errors should cause the
worker to restart.
QA steps
Smoke test: bootstrap, add-machine, destroy-controller --destroy-all-models.
Documentation changes
None.
Bug reference
Possibly fixes https://bugs.launchpad.net/juju/+bug/1695894