/juju

Move worker/modelworkermanager to dependency engine #8093

Merged
merged 3 commits into from Nov 16, 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 16, 2017

Description of change

Move worker/modelworkermanager to the machine agent dependency engine. Change the worker to use a StatePool to fetch Model objects, and remove the State.ModelActive helper.

QA steps

Smoke test bootstrap/deploy/destroy-controller.

Documentation changes

None.

Bug reference

None.

axw added some commits Nov 16, 2017

@axw
Move modelworkermanager to dependency engine 
Move worker/modelworkermanager to the machine
agent dependency engine. This enables it to
use the StatePool managed by worker/state.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
9ee2297
@axw
worker/modelworkermanager: use state pool 
Use StatePool in worker to get a Model object,
instead of using State.ModelActive.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
0f1fd1a
@axw
state: remove State.ModelActive 
The one place that was using this is now
using Model.MigrationMode directly.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
eebeff2
@wallyworld

wallyworld approved these changes Nov 16, 2017
View changes

Looks great!

@axw
Member

axw commented Nov 16, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Nov 16, 2017

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

axw commented Nov 16, 2017

Build failed: ?

@wallyworld wallyworld deleted a comment from jujubot Nov 16, 2017

@wallyworld wallyworld deleted a comment from axw Nov 16, 2017

@wallyworld
Owner

wallyworld commented Nov 16, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Nov 16, 2017

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

@jujubot jujubot merged commit cdc7916 into juju:state-controller-refactor Nov 16, 2017
1 check failed

1 check failed

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