/juju

firewaller: egress watcher fixes #8149

Merged
merged 2 commits into from Nov 29, 2017

Conversation

Reviewers

@wallyworld wallyworld

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

axw commented Nov 28, 2017 •
Edited 1 time

Description of change

The firewaller's egress address watcher has
been changed to wait for the initial event
of each watcher before doing sending any
output. It was previously waiting for some
initial events, but missed the relation units.
Due to this, tests would intermittently fail.

By waiting for the initial event of each
watcher, we can also eliminate the explicit
initialisation step in the watcher.

Also, fix a bug in the firewaller's egress
address watcher, where the embedded
machine address watcher was performing
bare channel sends. During worker
termination, this could lead to deadlock
(and was causing tests to timeout).

QA steps

  1. juju bootstrap aws c1
  2. juju bootstrap google c2
  3. juju switch c2 && juju deploy mysql && juju offer mysql:db
  4. juju switch c1 && juju deploy wordpress && juju relate wordpress c2:admin/mysql.db
    (check that they become functional)

Documentation changes

None.

Bug reference

None.

axw added some commits Nov 28, 2017

@axw
firewaller: improve firewaller egress watcher 
The firewaller's egress address watcher has
been changed to wait for the initial event
of each watcher before doing sending any
output. It was previously waiting for some
initial events, but missed the relation units.
Due to this, tests would intermittently fail.

By waiting for the initial event of each
watcher, we can also eliminate the explicit
initialisation step in the watcher.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
dd94f5f
@axw
firewaller: fix bare channel send deadlock 
Fix a bug in the firewaller's egress address watcher,
where the embedded machine address watcher was performing
bare channel sends. During worker termination, this could
lead to deadlock (and was causing tests to timeout).
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
2b58219
@axw
Member

axw commented Nov 29, 2017

Fix InstanceModeSuite.TestRemoteRelationRequirerRoleConsumingSide
@axw
Member

axw commented Nov 29, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Nov 29, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit e5f69ac into juju:develop Nov 29, 2017
1 check passed

1 check passed

continuous-integration/jenkins/pr-merge This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment