state: add machine storage for subordinates #6336
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
When a subordinate unit is added, create its machine storage when the principal unit is assigned to a machine. Fixes https://bugs.launchpad.net/juju/+bug/1595617
|
QA
|
mjs
approved these changes
Sep 28, 2016
| out.volumeAttachments[k] = v | ||
| } | ||
| for k, v := range rhs.volumeAttachments { | ||
| out.volumeAttachments[k] = v |
There was a problem hiding this comment.
I presume it's by design that the rhs wins if the same key appears in both sides?
There was a problem hiding this comment.
Storage instances cannot share a volume/filesystem (attachment), so it's impossible.
| } | ||
|
|
||
| func (u *Unit) assignToCleanMaybeEmptyMachineOps(requireEmpty bool) (_ *Machine, _ []txn.Op, err error) { | ||
| failure := func(err error) (*Machine, []txn.Op, error) { |
|
|
|
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.
When a subordinate unit is added, create its
machine storage when the principal unit is
assigned to a machine.
Fixes https://bugs.launchpad.net/juju/+bug/1595617