state: use supported type when writing leadership settings docs #2661

Merged
merged 1 commit into from Jun 26, 2015

Conversation

Projects
None yet
2 participants
Contributor

mjs commented Jun 26, 2015

A bare empty map is written to the settings collection by
addLeadershipSettingsOp which is unsupported by the multi-env txn
layer. This means that the document is written out without the
env-uuid field.

This is the bare minimum fix. There be further PRs which improve the
multi-env txn layer to avoid this kind of problem in the future.

This is part of the fix for LP #1468994.

(Review request: http://reviews.vapour.ws/r/2036/)

state: use supported type when writing leadership settings docs
A bare empty map is written to the settings collection by
addLeadershipSettingsOp which is unsupported by the multi-env txn
layer. This means that the document is written out without the
env-uuid field.

This is the bare minimum fix. There be further PRs which improve the
multi-env txn layer to avoid this kind of problem in the future.

This is part of the fix for LP #1468994.
Contributor

mjs commented Jun 26, 2015

$$merge$$

Contributor

jujubot commented Jun 26, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Jun 26, 2015

Merge pull request #2661 from mjs/1468994-bad-leadership-settings-1.24
state: use supported type when writing leadership settings docs

A bare empty map is written to the settings collection by
addLeadershipSettingsOp which is unsupported by the multi-env txn
layer. This means that the document is written out without the
env-uuid field.

This is the bare minimum fix. There be further PRs which improve the
multi-env txn layer to avoid this kind of problem in the future.

This is part of the fix for LP #1468994.

(Review request: http://reviews.vapour.ws/r/2036/)

@jujubot jujubot merged commit 216df3b into juju:1.24 Jun 26, 2015

@mjs mjs deleted the mjs:1468994-bad-leadership-settings-1.24 branch Jun 26, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment