/juju

Wait for machines on controller kill and destroy commands #6683

Merged
merged 2 commits into from Dec 9, 2016
+89 −17

Conversation

Reviewers

@bz2 bz2

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@macgreagoir @jujubot @bz2
@macgreagoir
Contributor

macgreagoir commented Dec 9, 2016

kill-controller and destroy-controller now also wait on machines yet
to be removed as well as the previous behaviour of waiting on models yet
to be destroyed. This fixes a bug in which machines in the controller
model were not given time to complete their removal before the
controller itself was destroyed.

Fixes lp:1642295

QA steps:

  • Best seen in a manual environment, as per the bug
  • bootstrap, then add-machine to the controller model
  • destroy-controller and observe the destroy procedure continue until the machine in the controller model is removed, which will happen after the default model is destroyed
$ juju destroy-controller -y manual
Destroying controller
Waiting for hosted model resources to be reclaimed
Waiting on 0 model, 1 machine
Waiting on 0 model, 1 machine
Waiting on 0 model, 1 machine
All hosted models reclaimed, cleaning up controller machines
  • Repeat testing kill-controller

jujubot added some commits Dec 8, 2016

@jujubot @macgreagoir
Merge pull request #6674 from macgreagoir/destroy-wait-on-machines 
Wait for machines on controller kill and destroy commands

`kill-controller` and `destroy-controller` now also wait on machines yet
to be removed as well as the previous behaviour of waiting on models yet
to be destroyed. This fixes a bug in which machines in the controller
model were not given time to complete their removal before the
controller itself was destroyed.

Fixes lp:1642295

QA steps:
 * Best seen in a manual environment, as per the bug
 * `bootstrap`, then `add-machine` to the controller model
 * `destroy-controller` and observe the destroy procedure continue until the machine in the controller model is removed, which will happen after the default model is destroyed
```
$ juju destroy-controller -y manual
Destroying controller
Waiting for hosted model resources to be reclaimed
Waiting on 0 model, 1 machine
Waiting on 0 model, 1 machine
Waiting on 0 model, 1 machine
All hosted models reclaimed, cleaning up controller machines
```
 * Repeat testing `kill-controller`
94f2012
@jujubot @macgreagoir
Merge pull request #6681 from macgreagoir/wait-controller-machines-race 
Fix race in kill suite controller machines test

Fixes lp:1648749

QA steps:
 * Data race tests should pass
0e0622e
@bz2

bz2 approved these changes Dec 9, 2016
View changes

Thanks!

@macgreagoir
Contributor

macgreagoir commented Dec 9, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Dec 9, 2016

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

@jujubot jujubot merged commit f139353 into juju:2.1 Dec 9, 2016

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