-
Notifications
You must be signed in to change notification settings - Fork 507
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge 25 into 26 on 21/06. #10362
Merged
Merged
Merge 25 into 26 on 21/06. #10362
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
The machines profile watcher was missing the ability to tie itself to the provisioner task life-cycle, which means that when a provisioner task was killed or restarted then the watcher was still spinning and never cleaned up, leaking as a resource. There is another problem that @jameinel spotted in the creation of the provisioner task, is that if the provisioner errored out on the construction of the provisioner task, then we never killed the other watchers and they could also be leaked. We should look at those in the near future to ensure that any watchers that die on construction are also cleaned up.
juju#10341 ## Description of change The machines profile watcher was missing the ability to tie itself to the provisioner task life-cycle, which means that when a provisioner task was killed or restarted then the watcher was still spinning and never cleaned up, leaking as a resource. There is another problem that @jameinel spotted in the creation of the provisioner task, is that if the provisioner errored out on the construction of the provisioner task, then we never killed the other watchers and they could also be leaked. We should look at those in the near future to ensure that any watchers that die on construction are also cleaned up. ## QA steps Ensure that the following test passes: ```console go test -v ./worker/provisioner/... -check.v -check.f=ProvisionerTaskSuite.TestStartStop ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/1833155
… not satisfy errors.IsNotFound.
…rors-25 juju#10354 ## Description of change Occasionally, juju does not corectly check provider 'not found" errors which get propagated and are surfacing to the users causing confusion. This PR improves error checks in provider code. I have examined all providers and am fairly certain that I have covered all occurrences. ## QA steps 1. bootstrap on gce 2. deploy something sizable.. I've used ```juju deploy cs:canonical-kubernetes``` 3. once things settle, run ```juju kill-controller --debug -y -t0 <your controller> --show-log``` and watch the logs... Before this PR, you'd get a few ```ERROR juju.provider.gce.gceapi conn_instance.go:131 while removing instance "juju-71b3b8-7": googleapi: Error 404: The resource 'projects/juju-239814/zones/us-east1-b/instances/juju-71b3b8-7' was not found, notFound``` After this PR, you will not get any ERROR (if killing is successful) ## Bug reference https://bugs.launchpad.net/juju/+bug/1831527
# Conflicts: # worker/provisioner/provisioner_task.go
|
# Conflicts: # worker/provisioner/provisioner_task.go
|
3 similar comments
|
|
|
FCO juju.testing mgo.go:216 failed to start mongo: mongod failed to listen on port 35982 |
|
jujubot
added a commit
that referenced
this pull request
Jun 22, 2019
#10367 ## Description of change Merge into develop, bringing forward: - #10366 from manadart/2.6-cache-testing-infrastructure - #10364 from manadart/2.6-config-watch-branch-determination - #10362 from anastasiamac/merge-25-26-2106 - #10346 from hmlanigan/branch - #10359 from hmlanigan/createdtomodelcache
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.
Fairly simple merge, includes:
#10341
#10354