Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(5410)

Issue 6498117: container: fix jujud arguments.

Can't Edit
Can't Publish+Mail
Start Review
Created:
11 years, 8 months ago by rog
Modified:
11 years, 7 months ago
Reviewers:
mp+123795, niemeyer, fwereade
Visibility:
Public.

Description

container: fix jujud arguments. Unfortunately we can't test this properly until we have something using container to do a deployment, which won't happen until the uniter integration branch (https://codereview.appspot.com/6497109/) is merged. We also add a Unit.AgentName method, meaning that we can use the same logic in various places that need to calculate an agent name from a unit. We also change the path where unit data is stored ($vardir/agents/unit-agent-name) so that any other agent data can have an entry in the agents directory too. https://code.launchpad.net/~rogpeppe/juju-core/056-container-fix/+merge/123795 Requires: https://code.launchpad.net/~rogpeppe/juju-core/055-no-global-vardir/+merge/123316 (do not edit description out of merge proposal)

Patch Set 1 #

Patch Set 2 : container: fix jujud arguments. #

Patch Set 3 : container: fix jujud arguments. #

Patch Set 4 : container: fix jujud arguments. #

Patch Set 5 : container: fix jujud arguments. #

Patch Set 6 : container: fix jujud arguments. #

Patch Set 7 : container: fix jujud arguments. #

Patch Set 8 : container: fix jujud arguments. #

Patch Set 9 : container: fix jujud arguments. #

Patch Set 10 : container: fix jujud arguments. #

Patch Set 11 : container: fix jujud arguments. #

Total comments: 2

Patch Set 12 : container: fix jujud arguments. #

Patch Set 13 : container: fix jujud arguments. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+175 lines, -103 lines) Patch
A [revision details] View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +2 lines, -0 lines 0 comments Download
M cmd/jujud/machine.go View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
M container/container.go View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +41 lines, -29 lines 0 comments Download
M container/container_test.go View 1 2 3 4 5 6 7 8 4 chunks +31 lines, -19 lines 0 comments Download
M environs/cloudinit/cloudinit.go View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M mstate/unit.go View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +8 lines, -0 lines 0 comments Download
M mstate/unit_test.go View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +4 lines, -0 lines 0 comments Download
M state/unit.go View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +7 lines, -0 lines 0 comments Download
M state/unit_test.go View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +4 lines, -0 lines 0 comments Download
M worker/machiner/export_test.go View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -2 lines 0 comments Download
M worker/machiner/machiner.go View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +28 lines, -14 lines 0 comments Download
M worker/machiner/machiner_test.go View 1 2 3 4 5 6 7 8 9 10 11 12 5 chunks +18 lines, -14 lines 0 comments Download
M worker/uniter/tools.go View 1 2 3 4 5 6 7 2 chunks +2 lines, -4 lines 0 comments Download
M worker/uniter/tools_test.go View 1 2 3 4 5 6 7 3 chunks +3 lines, -3 lines 0 comments Download
M worker/uniter/uniter.go View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +7 lines, -8 lines 0 comments Download
M worker/uniter/uniter_test.go View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +16 lines, -8 lines 0 comments Download

Messages

Total messages: 5
rog
Please take a look.
11 years, 8 months ago (2012-09-12 15:03:32 UTC) #1
fwereade
On 2012/09/12 15:03:32, rog wrote: > Please take a look. Much nicer; LGTM
11 years, 8 months ago (2012-09-12 15:11:03 UTC) #2
rog
Please take a look.
11 years, 7 months ago (2012-09-12 18:11:25 UTC) #3
niemeyer
Good stuff, LGTM. Only one trivial suggestion: https://codereview.appspot.com/6498117/diff/9002/state/unit.go File state/unit.go (right): https://codereview.appspot.com/6498117/diff/9002/state/unit.go#newcode485 state/unit.go:485: func (u ...
11 years, 7 months ago (2012-09-12 21:25:30 UTC) #4
rog
11 years, 7 months ago (2012-09-12 22:53:53 UTC) #5
*** Submitted:

container: fix jujud arguments.

Unfortunately we can't test this properly until
we have something using container to do a deployment,
which won't happen until the uniter integration
branch (https://codereview.appspot.com/6497109/)
is merged.

We also add a Unit.AgentName method, meaning
that we can use the same logic in various places that
need to calculate an agent name from a unit.

We also change the path where unit data is stored
($vardir/agents/unit-agent-name) so that any other
agent data can have an entry in the agents directory too.

R=fwereade, niemeyer
CC=
https://codereview.appspot.com/6498117

https://codereview.appspot.com/6498117/diff/9002/state/unit.go
File state/unit.go (right):

https://codereview.appspot.com/6498117/diff/9002/state/unit.go#newcode485
state/unit.go:485: func (u *Unit) AgentName() string {
On 2012/09/12 21:25:30, niemeyer wrote:
> Can we please call this as PathKey? That's really what it is. Its main
property
> is being unique among other entities and having no slashes so that we can use
it
> in a path without trouble. Anyone that wishes such properties can use it, no
> matter if it's dealing with the agent or not. We can document it as such as
> well.

Done.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b