lp:~dave-cheney/juju-core/122-fix-lp-1301706

Branch merges

Propose for merging

No branches dependent on this one.

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

Juju Engineering: Pending requested 2014-04-03

Diff: 20 lines (+3/-3)

1 file modified

state/watcher/watcher.go (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1301706: state/watcher: panic: runtime error: invalid memory address or nil pointer dereference

Critical

In Progress

Link a bug report

Related blueprints

2554. By Dave Cheney on 2014-04-03

Panic if values are not of the expected type

2553. By Jesse Meek on 2014-04-03

[r=dave-cheney],[bug=1300032] fix 1300032: charm: gccgo test failure

When network is down, http-proxy returns an
error in html format, hence the leading '<'.
Ensure the response code is 200, otherwise
return an error.

2552. By Andrew Wilkins on 2014-04-03

[r=axwalk] Add EnvironCapability to state.Policy

environs.EnvironCapability is moved to the
state package, extended with the
SupportsUnitPlacement method, and added to
the state.Policy interface.

Methods for creating machines and assigning
units to them are now modified to use the
SupportsUnitPlacement method to enable
policy implementations to block adding of
empty machines (juju add-machine) and to
block unit placement (deploy/add-unit --to).

Also, a new EnvironBase type is added to
provider/common, which implements some
default behaviour common to all providers
such as the new SupportsUnitPlacement
method.

A followup will override the default
behaviour of SupportsUnitPlacement in the
Azure provider, blocking placement if in
availability-sets-enabled mode.

https://codereview.appspot.com/77820044/

2551. By Andrew Wilkins on 2014-04-03

[r=axwalk] Add DistributionGroup to StartInstanceParams

DistributionGroup returns instances that
StartInstance should consider when provisioning
for high availability (i.e. the new instance +
those in DistributionGroup should be distributed
for high availability.)

DistributionGroup is implemented in terms of
a new provisioner API method of the same name.
This API returns different instances depending
on the machine passed in. For an environ manager,
all other environ manager instances are returned;
for a non-environ manager, all other instances
with services in common are returned.

This is in preparation for modifying the Azure
provider to group instances into the same cloud
service when in availability-sets-enabled mode.

https://codereview.appspot.com/75250043/

2550. By Dave Cheney on 2014-04-02

[r=dave-cheney],[bug=1251076] Workaround LP 1251076

gccgo appears to get confused and thinks that out[1] is not nil when in fact it is an interface value of type error and value nil.

This workaround solves the problem by leaving error as nil if in fact it was nil and causes no harm for gc because the predicates above assert that if out[1] is not nil, then it is an error type.

https://codereview.appspot.com/83340045/

2549. By Wayne Witzel III on 2014-04-02

[r=wwitzel3] worker/peergrouper: use mongo.SelectPeerHostPort

This will ensure that we are using the same method for getting the peer
hostPort even if the implementation details of SelectInternalHostPort change.

https://codereview.appspot.com/83130045/

2548. By Wayne Witzel III on 2014-04-02

[r=wwitzel3] state/api/agent: added IsMaster to the API

IsMaster provides a way to let an API worker know that it is on the same
machine as the API server that has a mongo peer address that is the primary
mongo server for a given replicaset.

https://codereview.appspot.com/83150043/

2547. By Roger Peppe on 2014-04-02

[r=rogpeppe] worker/singular: new package

This acts as a wrapper that will allow us to
start workers that require only one instance.

https://codereview.appspot.com/83300047/

2546. By John A Meinel on 2014-04-02

[r=jameinel] Merge lp:juju-core/1.18 into trunk.

This brings in the bug fixes for the Joyent provider, and for installing 'curl' with the manual provider.

2545. By Roger Peppe on 2014-04-02

[r=rogpeppe] environs/cloudinit: use StateServingInfo

We use StateServingInfo in MachineConfig, because it exactly
represents what we want to store there. We also change
the arguments to agent.NewStateMachineConfig to separate
out the StateServingInfo, allowing us to drop the extra params
struct type.

We also rename MachineConfig.StateServer to MachineConfig.Bootstrap,
because extra state server machines should not have StateServingInfo
in them - Bootstrap more accurately reflects its meaning.

https://codereview.appspot.com/83530043/