Fix worker leak in provisioner #11141
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jameinel
approved these changes
Jan 22, 2020
|
|
|
Shouldn't be hard to add a test for this. Just get the |
| @@ -168,6 +162,13 @@ func (task *provisionerTask) Wait() error { | |||
|
|
|||
| func (task *provisionerTask) loop() error { | |||
|
|
|||
| // Get existing machine distributions. | |||
| err := task.populateAvailabilityZoneMachines() | |||
There was a problem hiding this comment.
I was wondering whether there was anything that expected availabilityZoneMachines to be populated by the time the worker is returned, but from going through the code it looks like the only things that use it are called from loop, so seems all good.
manadart
added a commit
to manadart/juju
that referenced
this pull request
Jan 23, 2020
stoppage when an error is returned by populateAvailabilityZoneMachines. Always add a test for in-theatre bugs previously uncovered.
4 tasks
manadart
added a commit
to manadart/juju
that referenced
this pull request
Jan 23, 2020
stoppage when an error is returned by populateAvailabilityZoneMachines. Always add a test for in-theatre bugs previously uncovered.
manadart
added a commit
to manadart/juju
that referenced
this pull request
Jan 23, 2020
stoppage when an error is returned by populateAvailabilityZoneMachines. Always add a test for in-theatre bugs previously uncovered.
jujubot
added a commit
that referenced
this pull request
Jan 23, 2020
#11146 ### Checklist - [x] Checked if it requires a [pylibjuju](https://github.com/juju/python-libjuju) change? - [x] Added [integration tests](https://github.com/juju/juju/tree/develop/tests) for the PR? - [x] Added or updated [doc.go](https://discourse.jujucharms.com/t/readme-in-packages/451) related to packages changed? - [x] Do comments answer the question of why design decisions were made? ---- ## Description of change This patch simply adds a unit test to verify the change made in #11141. It should be a golden rule that where we fix a bug from the field for functionality without test coverage, that coverage gap is closed. ## QA steps Unit tests fail sans #11141, but pass with it applied. ## Documentation changes None. ## Bug reference N/A
jujubot
added a commit
that referenced
this pull request
Jan 26, 2020
#11151 ### Checklist - [x] Checked if it requires a [pylibjuju](https://github.com/juju/python-libjuju) change? - [x] Added [integration tests](https://github.com/juju/juju/tree/develop/tests) for the PR? - [x] Added or updated [doc.go](https://discourse.jujucharms.com/t/readme-in-packages/451) related to packages changed? - [x] Do comments answer the question of why design decisions were made? ---- ## Description of change This pulls the latest changes in the 2.7 branch into develop. Brings in: - #11139 from jameinel/2.7-detach-volume-state-changing-1860542 - #11141 from howbazaar/2.7-fix-provisioner-leak - #11144 from babbageclunk/2.7-fix-destroy-test - #11137 from ycliuhw/feature/vSphere-disk-resizing - #11146 from manadart/2.7-provisioner-worker-test - #11147 from manadart/relocate-systemd-files - #11150 from manadart/2.7-controller-integration-test - #11149 from manadart/2.7-systemd-upgrades (No conflicts when merging.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
During analysis of the goroutine leak on prodstack, we identified that there was a leak of provisioner tasks. Analysing the code, we found that the creation of the availability zone map for the task was done after the task loop was started, but if an error occurred, the task was never killed.
This fix also looks like it will address the error case where a new machine was started but it was not able to log in due to a second active task having reset its password.
QA steps
Run the tests.
Documentation changes
Internal change only, nothing to document.