Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to cleanup models whether volumes exist or not. #9793

Merged
merged 2 commits into from Feb 26, 2019

Conversation

jameinel
Copy link
Member

Description of change

Add a test that shows the issue. Use an $or so that we can handle when
the volumes and/or filesystems don't exist as they didn't on models
upgraded from 2.1.

QA steps

See the new test that was added. When the change isn't applied it fails as in bug #1800872.

... error stack:
	state changing too quickly; try again soon
	github.com/juju/juju/state/model.go:1016: failed to destroy model

Documentation changes

None.

Bug reference

https://bugs.launchpad.net/juju/+bug/1800872

Add a test that shows the issue. Use an $or so that we can handle when
the volumes and/or filesystems don't exist as they didn't on models
upgraded from 2.1.
@jameinel
Copy link
Member Author

$$merge$$

@jameinel
Copy link
Member Author

$$merge$$ failure was a TestWatch in FirewallerTest

@jujubot jujubot merged commit 6fcdf8a into juju:2.5 Feb 26, 2019
@jameinel jameinel mentioned this pull request Mar 1, 2019
jujubot added a commit that referenced this pull request Mar 1, 2019
#9819

## Description of change

Another ratchet of changes in 2.5 that need to be in develop.
 prdesc Merge pull request #9793 from jameinel/2.5-cleanup-volumes-1800872
 prdesc Merge pull request #9788 from babbageclunk/raftlease-application-leaders
 prdesc Merge pull request #9786 from howbazaar/2.5-move-worker
 prdesc Merge pull request #9782 from jameinel/2.5-network-exit-1807615
 prdesc Merge pull request #9781 from timClicks/2.5
 prdesc Merge pull request #9778 from anastasiamac/current-controller-saga
 prdesc Merge pull request #9776 from SimonRichardson/lxd-sub-acceptance-test
 prdesc Merge pull request #9777 from anastasiamac/storage-err-fix-machine-removal-25
 prdesc Merge pull request #9759 from wallyworld/k8s-ephemeral-storage
 prdesc Merge pull request #9773 from achilleasa/emit-errors-for-invalid-credential-names
 prdesc Merge pull request #9774 from achilleasa/backport-leader-unit-support-for-juju-run
 prdesc Merge pull request #9764 from manadart/2.5-maas-container-inherit-props
 prdesc Merge pull request #9761 from Veebers/update-cloud-controller
 prdesc Merge pull request #9770 from hmlanigan/2.5-lxd-profile

## QA steps

See individual patches.

## Documentation changes

See individual patches.

## Bug reference

 prdesc https://bugs.launchpad.net/juju/+bug/1800872
 prdesc https://bugs.launchpad.net/juju/+bug/1807615
 prdesc https://bugs.launchpad.net/juju/+bug/1786140
 prdesc https://bugs.launchpad.net/juju/+bug/1813079
 prdesc https://bugs.launchpad.net/juju/+bug/1702538
 prdesc https://bugs.launchpad.net/juju/+bug/1816826
 prdesc https://bugs.launchpad.net/juju/+bug/1815636
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants