Stop the serving info setter replacing the cert from the cert updater. #6303

Merged
merged 1 commit into from Sep 22, 2016

Conversation

Projects
None yet
3 participants
Owner

howbazaar commented Sep 22, 2016

There was a race between the serving info setter and the cert updater.

Most of the time the serving info would run first, and set the cert based on the copy in the database. But sometimes the cert updater would run first and the new cert would be overwritten by the cert stored in the database.

QA

Was able to reproduce the failure by running the test repeatedly while the machine was very busy.
Can no longer reproduce the failure.

mjs approved these changes Sep 22, 2016

Looks good. Glad you figured this one out!

+ if hasInfo {
+ // Use the existing Cert as it may have been updated already
+ // by the cert updater worker to have this machine's IP address
+ // as part of the info. This changed cert is never put back into
@mjs

mjs Sep 22, 2016

Contributor

should that be "as part of the cert"?

@howbazaar

howbazaar Sep 22, 2016

Owner

Probably.

Owner

howbazaar commented Sep 22, 2016

$$merge$$

Contributor

jujubot commented Sep 22, 2016

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

@jujubot jujubot merged commit 11f726a into juju:master Sep 22, 2016

@howbazaar howbazaar deleted the howbazaar:cert-updater-test-fix branch Sep 22, 2016

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