/juju

apiserver/uniter: Ignore EnterScope from invalid units #7547

Merged
merged 1 commit into from Jun 23, 2017

Conversation

Reviewers

@wallyworld wallyworld

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@babbageclunk @jujubot @wallyworld
@babbageclunk
Member

babbageclunk commented Jun 23, 2017

Description of change

If we see a request to EnterScope where the unit's principal isn't in
the relation specified, we log and ignore it. These requests can happen
when a controller is upgraded from 2.1 to 2.2, and the model has a
subordinate application related to multiple principals - the uniter used to think
that those units should be in the relation, but they shouldn't, and
allowing them to enter scope will prevent the application from being
removed because its relations don't go away (since they have units in
scope that never leave).

Ignore the requests to prevent the old uniters from crashing with an
error, which would prevent upgrading them.
Alternative implementation of #7542, with the check for validity of the relation unit being
opt-in rather than raising an error on construction - there are at least 3 or 4 places in the
code that create potentially-invalid RelationUnits to query InScope or Joined, and
this was a simpler fix to avoid breaking them.

QA steps

  • Bootstrap a 2.1.1 controller.
  • Deploy the ubuntu charm twice as ubuntu and ubuntu2 apps, and ntp.
  • Relate ntp to ubuntu and ubuntu2.
  • Confirm in the DB that there are relationscopes records referring to ubuntu2 for the relation between ubuntu and ntp.
  • Confirm that the unitcount for the ubuntu-ntp relation is 3, which is consistent with other information in the DB but incorrect.
  • Upgrade the controller and model to the version including this PR (2.2.1)
  • Confirm that the "correct unit counts" upgrade step message appears in the logs.
  • Check in the DB that the unit count for the ubuntu-ntp relation is now 2, and that there aren't any ubuntu2 records in the relationscopes records for the ubuntu-ntp relation.
  • Observe "ignoring EnterScope" messages in the controller log indicating that the uniter tried to re-enter the invalid unit.
  • Remove the ubuntu application - it should finish successfully.

Bug reference

Really fixes https://bugs.launchpad.net/juju/+bug/1699050
@babbageclunk
apiserver/uniter: Ignore EnterScope from invalid units 
If we see a request to EnterScope where the unit's principal isn't in
the relation specified, we log and ignore it. These requests can happen
when a controller is upgraded from 2.1 to 2.2 - the uniter used to think
that those units should be in the relation, but they shouldn't, and
allowing them to enter scope will prevent the application from being
removed because its relations don't go away (since they have units in
scope that never leave).

Ignore the requests to prevent the old uniter from crashing with an
error, which would prevent upgrading them.
2a63b3d
@babbageclunk
Member

babbageclunk commented Jun 23, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Jun 23, 2017

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

babbageclunk commented Jun 23, 2017

Check failure looks spurious - presence pruner tests failed?
!!build!!
@jujubot
Contributor

jujubot commented Jun 23, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/11193
@babbageclunk
Member

babbageclunk commented Jun 23, 2017

Looks like a spurious failure of MachineSuite.TestMigratingModelWorkers in cmd/jujud/agent.

$$merge$$
@jujubot
Contributor

jujubot commented Jun 23, 2017

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

@jujubot jujubot merged commit b6932f3 into juju:2.2 Jun 23, 2017
1 check failed

1 check failed

github-check-merge-juju Ran tests against PR. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

@babbageclunk babbageclunk referenced this pull request Jun 23, 2017

Closed

apiserver/uniter: Ignore EnterScope with invalid principals #7542

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