lp://staging/~fwereade/juju-core/errors-cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/~juju/juju-core/trunk

Tim Penhey (community): Approve on 2013-06-20

Diff: 821 lines (+214/-133)

22 files modified

charm/repo.go (+8/-15)
charm/repo_test.go (+25/-16)
cmd/juju/deploy_test.go (+1/-1)
cmd/juju/publish.go (+8/-6)
cmd/juju/upgradecharm_test.go (+7/-6)
cmd/jujud/agent_test.go (+11/-10)
cmd/jujud/bootstrap_test.go (+6/-6)
environs/dummy/storage.go (+1/-1)
environs/ec2/storage.go (+1/-1)
environs/imagemetadata/simplestreams.go (+5/-5)
environs/local/storage.go (+1/-1)
environs/maas/storage.go (+2/-2)
environs/openstack/storage.go (+1/-1)
environs/tools.go (+1/-1)
environs/tools_test.go (+4/-4)
errors/errors.go (+42/-40)
errors/errors_test.go (+74/-0)
state/apiserver/client_test.go (+1/-1)
state/apiserver/errors_test.go (+2/-2)
state/open.go (+8/-4)
state/state_test.go (+0/-7)
testing/charm.go (+5/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1268. By William Reade on 2013-06-12

mock charm store now uses errors.NotFoundError

1267. By William Reade on 2013-06-12

merge parent

1266. By William Reade on 2013-06-12

make errors somewhat consistent

1265. By William Reade on 2013-06-11

merge parent

1264. By William Reade on 2013-06-10

trivial error message fix (but notice how little it's tested for...)

1263. By William Reade on 2013-06-10

rewrite charm.Config for clarity, adding currently-unused ParseSettingsYAML method and new Settings type

1262. By Ian Booth on 2013-06-10

Move assignment policy to global env config

Previoysly, each provider defined it's own AssignmentPolicy,
which was hard coded to AssignNew. Now, it's been made an
env setting with default AssignNew. With containers, it will be
possible to add a unit to an existing machine (if not dirty) so
this work is a step in that direction.

R=jameinel, fwereade
CC=
https://codereview.appspot.com/9824043

1261. By Ian Booth on 2013-06-10

Add dirty flag to machine state

When choosing an unused machine to assign a unit to, a check was being made
to see if there were any principal units for the machine. If machines had units
assigned and then unassigned, the machine would appear clean since number of
principal unit goes to 0 but the machine should still be considered dirty.

The machine state has a "clean" flag (boolean). Machines are created with the
clean flag set to true. It is set false when a machine has a unit assigned,
and not reset when units are unassigned. The assign to unused machine logic
is updated to look at the clean flag.

R=fwereade, thumper
CC=
https://codereview.appspot.com/9820043

1260. By Tim Penhey on 2013-06-10

First part of the provisioner refactoring.

This branch breaks up the current provisioner and defines some interfaces that
we'll be using for containers.

The broker interface is what we have starting, stopping instances, and listing
instances and related machines.

An environment broker is written that defers the actual calls to the environ.

The provisioner now creates a provisioning task for the environment provider
using a machine watcher and the environment broker. The common provisioning
methods are now in provisioner_task.go.

I refactored some of the methods as we were duplicating a lot of calls, like
get all instances, and then getting instances for individual ids. Also,
looking up specific machines, and also getting all machines. Now we just do
the "all" gets, and keep a map around for the duration of the checks.

R=wallyworld, mue, fwereade, rog
CC=
https://codereview.appspot.com/9937046

1259. By Frank Mueller on 2013-06-07

state: added CleanupWatcher

The CleanupWatcher signals the demand for the running of
state.Cleanup(). It is the first in a row of CLs to add
an according worker.

R=fwereade, dimitern
CC=
https://codereview.appspot.com/10078043