/juju

Upgrade fixes for LP #1403738 #1343

Merged
merged 2 commits into from Dec 18, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@mjs @jujubot
@mjs
Contributor

mjs commented Dec 18, 2014

Two separate fixes here.

The first changes SetAgentVersion to use a raw transaction as it is called before upgrade steps have run.

The second ensures that container setup in the machine agent is done after upgrades are complete. This involves some reorganisation of the API workers that need to start after upgrades are complete.

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

mjs added some commits Dec 18, 2014

@mjs
state: use a raw transaction in SetAgentVersion 
This method may get called before DB migration has run so automatic
addition of env UUID is a bad idea.

Part of the fix for LP #1403738.
eda5573
@mjs
cmd/jujud: introduce api-post-upgrade worker 
This worker runs all other workers that need to be started after
upgrades have finished. The main benefit is that it stops container
setup from running during upgrades, but it also makes the code more
readable and avoids many startWorkerAfterUpgrade calls.

Part of the fix for LP #1403738.
f07c731
@mjs
Contributor

mjs commented Dec 18, 2014

$$fixes-1403738$$
@jujubot
Contributor

jujubot commented Dec 18, 2014

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

jujubot added a commit that referenced this pull request Dec 18, 2014

@jujubot
Merge pull request #1343 from mjs/1403738-fix-upgrades 
Upgrade fixes for LP #1403738

Two separate fixes here. 

The first changes SetAgentVersion to use a raw transaction as it is called before upgrade steps have run.

The second ensures that container setup in the machine agent is done _after_ upgrades are complete. This involves some reorganisation of the API workers that need to start after upgrades are complete.

(Review request: http://reviews.vapour.ws/r/664/)
3cecce6

@jujubot jujubot merged commit 3cecce6 into juju:master Dec 18, 2014

@mjs mjs deleted the mjs:1403738-fix-upgrades branch Dec 19, 2014

This was referenced Jan 16, 2015

Closed
Merged

jujubot added a commit that referenced this pull request Jan 18, 2015

@jujubot
Merge pull request #1432 from ericsnowcurrently/1.21-backport-fix-140… 
…3738

cmd/jujud: introduce api-post-upgrade worker

See https://bugs.launchpad.net/juju-core/1.21/+bug/1411502.

The 1.22 patch (for 1403738) is PR #1343 (merged: 3cecce6).

(Review request: http://reviews.vapour.ws/r/752/)
dd57286
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment