Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Fix restore/azure #1526
Conversation
axw
added some commits
Feb 3, 2015
|
$$fixes-1417178$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
added a commit
that referenced
this pull request
Feb 3, 2015
jujubot
merged commit 6ae829e
into
juju:master
Feb 3, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
axw commentedFeb 3, 2015
Azure was returning ErrNotBootstrapped from its StateServerInstances
method, which is not necessarily true. In the restore scenario run
by QA, Azure is bootstrapped and then the state server instance is
killed OOB. So, we change the StateServerInstances method to return
ErrNotBootstrapped instead. The "EnsureNotBootstrapped" code still
assumes that the environment is not bootstrapped if this error is
returned from StateServerInstances (i.e. the conversion moves up a
level).
The Azure provider will now also handle the scenario where there
are cloud services without deployments, returning ErrNoInstances
instead of ErrPartialInstances.
We also update the restore plugin to check for: ErrPartialInstances
(multiple state server instances created, some but not all alive),
and ErrNoInstances in the result of StateServerInstances.
Fixes https://bugs.launchpad.net/juju-core/+bug/1417178
(Review request: http://reviews.vapour.ws/r/851/)