/juju

lp1541473: Don't add new controllers to the replicaset until they are "started" #4514

Merged
merged 4 commits into from Feb 24, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@cherylj @wallyworld @jujubot
@cherylj

cherylj commented Feb 24, 2016

Backport of PR #4338

Had to update terminology to reference "state servers" rather than controllers. Also had to use the old newIdPrefixWatcher for the new watcher.

Cheryl Jennings added some commits Feb 7, 2016

lp1541473: Wait for "started" before adding machine 
Machines should be in "started" state before being added
to the mongo replicaset to avoid the deadlock described
in bug 1541473.

Had to rename "controller" to "state server" to backport
this to 1.25
8f8cb48
lp1541473 - Resize certChangedChan 
It is possible for the certupdater to come
up before the apiserver does, and to send
multiple updates for the certificate.  The
certChangedChan should have a larger size
to accommodate these requests.

I chose 10 as we can allow up to 7 state
servers, and we may update the cert for
each server, plus another update to account
for addresses local to machine 0 (::1,
127.0.0.1, etc).
b6dc7a6
Address review comments 
Add in additional comments around the change for
certChangedChan.

Remove to-do for improvement, as that will only
happen on 2.0 with the dependency engine work.
43c46e5
Move suite_test.go to the peergrouper package 
Tests were not running in this directory because
suite_test.go was the only file in the
peergrouper_test package.  Updated that file, and
added in mock information for the new watcher
and machine status methods added in the fix for
bug 1541473.  Unit tests need to be added and that
work is tracked in bug 1543408.

Modified commit to use old "state server"
terminology.
f10660b
@wallyworld
Owner

wallyworld commented Feb 24, 2016

LGTM assuming tested live
@cherylj

cherylj commented Feb 24, 2016

Yes, I tested live on aws and maas.
@cherylj

cherylj commented Feb 24, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Feb 24, 2016

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

jujubot added a commit that referenced this pull request Feb 24, 2016

@jujubot
Merge pull request #4514 from cherylj/enable-ha-fix-1.25 
lp1541473: Don't add new controllers to the replicaset until they are "started"

Backport of PR #4338

Had to update terminology to reference "state servers" rather than controllers.  Also had to use the old newIdPrefixWatcher for the new watcher.
82c7189

@jujubot jujubot merged commit 82c7189 into juju:1.25 Feb 24, 2016

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