Allow enable-ha to work regardless of selected model #6421
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
added 2 commits
October 11, 2016 11:15
This closes a small testing gap.
This facade should have always been for controller logins only, but it has been left exposed for model only logins for compatibility reasons.
wallyworld
approved these changes
Oct 11, 2016
| @@ -54,23 +54,32 @@ func NewHighAvailabilityAPI(st *state.State, resources facade.Resources, authori | |||
| }, nil | |||
| } | |||
|
|
|||
| // EnableHA adds controller machines as necessary to ensure the | |||
| // controller has the number of machine specified. | |||
| @@ -27,6 +27,7 @@ var controllerFacadeNames = set.NewStrings( | |||
| var commonFacadeNames = set.NewStrings( | |||
| "Pinger", | |||
| "Bundle", | |||
| "HighAvailability", // Exposed for model logins for backwards compatibility. | |||
There was a problem hiding this comment.
Can you make this a bug TODO to fix once we very that no external clients use it. Target the bug to 2.0.1
| to ensure that the specified number of controllers are made available. | ||
| must itself be highly available. The enable-ha command will ensure | ||
| that the specified number of controller machines are used to make up the | ||
| controller. |
There was a problem hiding this comment.
... are used to make up the controller cluster.
Perhaps? TBH, "...the specified number of controllers...." reads ok to me.
There was a problem hiding this comment.
As per IRC, I'm pretty sure that "controller" is supposed to refer to the cluster (if any).
added 6 commits
October 11, 2016 14:54
This function is no longer called outside the package. Removed the misleading docstring too.
There is no way that EnableHA could support anything but one controller so return an error if more than one controller spec is passed. Limiting handling to just one spec also allowed signficant simplification of the EnableHA function.
The model tag field accepted by EnableHA was optional and validated but not actually used for anything. It didn't make sense anyway and wasnt' being tested. Removing it won't break older clients. The field will just be ignored.
It never made sense and is no longer checked server side. It wasn't being tested here either.
The enable-ha command is now a controller command instead of a model command. This means it can be issued regardless of the currently selected model. Also improved the command help text slightly. Fixes https://bugs.launchpad.net/juju/+bug/1607170
mjs
force-pushed
the
1607170-enable-ha-args
branch
from
1896bb0
to
ba13a3d
Compare
|
|
|
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.
juju enable-hanow just works without requiring the controller model be selected.There were a number of things done to make this work and some cleanup too:
apiserver.highavailability.EnableHASinglefunction has been hidden.EnableHAAPI call will now fail if given more than one controller spec. Passing more than one makes no sense. This allowedEnableHAto be somewhat simplified.model-tagfield previously validated (but not used) by theEnableHAAPI. This will not break old clients if they send it, but it is no longer checked.juju enable-hacommand is now a controller command instead of a model command. This means that-m controlleris no longer necessary and the-carg is now available if needed.Fixes https://bugs.launchpad.net/juju/+bug/1607170
QA
Ran
juju enable-hawith various arguments when thedefaultmodel was selected.Also confirmed that an rc3 client can enable HA as before using
juju enable-ha -m controller.