Skip to content
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 13 commits into from
Jun 21, 2019
Merged

Merge 25 into 26 on 21/06. #10362

merged 13 commits into from
Jun 21, 2019

Conversation

anastasiamac
Copy link
Contributor

@anastasiamac anastasiamac commented Jun 21, 2019

Fairly simple merge, includes:
#10341
#10354

SimonRichardson and others added 12 commits June 18, 2019 14:56
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
…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
@anastasiamac
Copy link
Contributor Author

$$merge$$

# Conflicts:
#	worker/provisioner/provisioner_task.go
@anastasiamac
Copy link
Contributor Author

$$merge$$

3 similar comments
@anastasiamac
Copy link
Contributor Author

$$merge$$

@anastasiamac
Copy link
Contributor Author

$$merge$$

@hpidcock
Copy link
Member

$$merge$$

@anastasiamac
Copy link
Contributor Author

FCO juju.testing mgo.go:216 failed to start mongo: mongod failed to listen on port 35982

@anastasiamac
Copy link
Contributor Author

$$merge$$

@jujubot jujubot merged commit a6d900b into juju:2.6 Jun 21, 2019
@anastasiamac anastasiamac deleted the merge-25-26-2106 branch June 21, 2019 11:03
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants