Please take a look.
https://codereview.appspot.com/88030043/diff/1/agent/mongo/upgrade.go File agent/mongo/upgrade.go (right):
https://codereview.appspot.com/88030043/diff/1/agent/mongo/upgrade.go#newcode92 agent/mongo/upgrade.go:92: return false, fmt.Errorf("mongod did not cleanly terminate: %v", err) On 2014/04/15 08:33:38, rog wrote: > "cannot kill mongod: %v" > ?
Done.
https://codereview.appspot.com/88030043/diff/1/cmd/jujud/machine.go File cmd/jujud/machine.go (right):
https://codereview.appspot.com/88030043/diff/1/cmd/jujud/machine.go#newcode431 cmd/jujud/machine.go:431: if errors.IsUnauthorizedError(err) { On 2014/04/15 08:33:38, rog wrote: > // TODO remove this when we no longer need > // compatibility with pre-HA environments.
> ?
https://codereview.appspot.com/88030043/diff/1/cmd/jujud/machine.go#newcode433 cmd/jujud/machine.go:433: added, ensureErr := a.ensureMongoAdminUser(agentConfig, info.StatePort, namespace) On 2014/04/15 08:33:38, rog wrote: > Perhaps slightly easier to follow the logic if we return > early when possible?
> added, ensureErr := a.ensureMongoAdminUser(agentConfig, info.StatePort, > namespace) > if ensureErr != nil { > return nil, fmt.Errorf("cannot ensure admin user: %v", ensureErr) > } > if !added { > // No user added, so it's probably a genuine unauthorized error. > return nil, err > } > st, m, err = openState(agentConfig)
https://codereview.appspot.com/88030043/
« Back to merge proposal
Please take a look.
https:/ /codereview. appspot. com/88030043/ diff/1/ agent/mongo/ upgrade. go upgrade. go (right):
File agent/mongo/
https:/ /codereview. appspot. com/88030043/ diff/1/ agent/mongo/ upgrade. go#newcode92 upgrade. go:92: return false, fmt.Errorf("mongod did not
agent/mongo/
cleanly terminate: %v", err)
On 2014/04/15 08:33:38, rog wrote:
> "cannot kill mongod: %v"
> ?
Done.
https:/ /codereview. appspot. com/88030043/ diff/1/ cmd/jujud/ machine. go machine. go (right):
File cmd/jujud/
https:/ /codereview. appspot. com/88030043/ diff/1/ cmd/jujud/ machine. go#newcode431 machine. go:431: if errors. IsUnauthorizedE rror(err) {
cmd/jujud/
On 2014/04/15 08:33:38, rog wrote:
> // TODO remove this when we no longer need
> // compatibility with pre-HA environments.
> ?
Done.
https:/ /codereview. appspot. com/88030043/ diff/1/ cmd/jujud/ machine. go#newcode433 machine. go:433: added, ensureErr := minUser( agentConfig, info.StatePort, namespace)
cmd/jujud/
a.ensureMongoAd
On 2014/04/15 08:33:38, rog wrote:
> Perhaps slightly easier to follow the logic if we return
> early when possible?
> added, ensureErr := a.ensureMongoAd minUser( agentConfig, agentConfig)
info.StatePort,
> namespace)
> if ensureErr != nil {
> return nil, fmt.Errorf("cannot ensure admin user: %v", ensureErr)
> }
> if !added {
> // No user added, so it's probably a genuine unauthorized error.
> return nil, err
> }
> st, m, err = openState(
Done.
https:/ /codereview. appspot. com/88030043/