state: Remove user permissions when removing model docs #5992

Merged
merged 2 commits into from Aug 15, 2016

Conversation

Projects
None yet
2 participants
Contributor

mjs commented Aug 15, 2016

Documents in the permissions collection were being left behind after a model was removed. This was preventing models from being migrated away from a controller and then back again.

Fixes LP 1612500.

QA Steps

$ juju bootstrap B lxd --upload-tools &
$ juju bootstrap A lxd --upload-tools &
$ juju wait
$ juju switch A
$ juju add-model foo
$ juju deploy ubuntu
# wait...
$ JUJU_DEV_FEATURE_FLAGS=migration juju migrate foo B
# wait...
$ juju switch B:foo
$ JUJU_DEV_FEATURE_FLAGS=migration juju migrate foo A
# wait...
$ juju switch A:foo
$ juju status
# ensure that agents are happy

Previously, the second migration would fail.

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

mjs added some commits Aug 15, 2016

state: Remove user permissions when removing model docs
Documents in the permissions collection were being left behind after a
model was removed. This was preventing models from being migrated away
from a controller and then back again.

Fixes LP 1612500.
Contributor

mjs commented Aug 15, 2016

$$merge$$

Contributor

jujubot commented Aug 15, 2016

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

Contributor

jujubot commented Aug 15, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8758

Contributor

mjs commented Aug 15, 2016

$$merge$$

Contributor

jujubot commented Aug 15, 2016

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

Contributor

jujubot commented Aug 15, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8759

Contributor

mjs commented Aug 15, 2016

$$oh-ffs$$

Contributor

jujubot commented Aug 15, 2016

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

Contributor

jujubot commented Aug 15, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8765

Contributor

mjs commented Aug 15, 2016

$$merge$$

Contributor

jujubot commented Aug 15, 2016

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

Contributor

jujubot commented Aug 15, 2016

Build failed: Does not match ['fixes-1613444']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8781

Contributor

mjs commented Aug 15, 2016

$$merge$$

Contributor

jujubot commented Aug 15, 2016

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

@jujubot jujubot merged commit a8c2b9e into juju:master Aug 15, 2016

@mjs mjs deleted the mjs:1612500-MM-fail-user-perms branch Aug 15, 2016

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