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

Worker v3 fixes #13413

Merged
merged 2 commits into from
Oct 15, 2021
Merged

Worker v3 fixes #13413

merged 2 commits into from
Oct 15, 2021

Conversation

wallyworld
Copy link
Member

@wallyworld wallyworld commented Oct 13, 2021

This PR updates the juju/worker dependency to v3 so that a new API WaitWorker can be used.
The first commit is the dependency update. The second commit are the functional changes to Juju.

Basically, when a worker is stopped and the same named worker may need to be started again with a different config, the WaitWorker api needs to be called first to ensure the previously stopped worker is fully terminated in the runner.

A new helper function ReplaceStoppedWorker is added to wrap the calls to Wait and Run.

QA steps

The issue showed up in unit tests - it is very intermittent.
I did a regression test by deploying a cmr relation and adding/removing offers / saas.
I also deployed, removed, and deployed a k8s charm.

Bug reference

https://bugs.launchpad.net/juju/+bug/1945999

@wallyworld wallyworld changed the title WIP: Worker v3 fixes Worker v3 fixes Oct 13, 2021
worker/caasoperator/caasoperator.go Outdated Show resolved Hide resolved
worker/runner.go Outdated Show resolved Hide resolved
worker/runner.go Outdated Show resolved Hide resolved
@hpidcock hpidcock added the 2.9 label Oct 14, 2021
@wallyworld wallyworld force-pushed the worker-v3-fixes branch 5 times, most recently from fa68e08 to 7d8fafe Compare October 14, 2021 08:07
@wallyworld
Copy link
Member Author

$$merge$$

@wallyworld
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit 095cb7b into juju:2.9 Oct 15, 2021
@wallyworld wallyworld mentioned this pull request Oct 15, 2021
jujubot added a commit that referenced this pull request Oct 15, 2021
#13421

Merge 2.9

#13406 Take into account manual machine arches when validating constraints
#13409 Fix podspec deployment/statefulset/daemonset upgrade.
#13410 update-k8s also updates any controller proxy
#13411 Acceptance tests - move away from unsupported series
#13402 grab bag of metrics updates
#13414 Remove ContainerBridgeName bootstrap configuration
#13415 Introduce assumes expression sat checker
#13420 Sync tools help msg
#13413 Worker v3 fixes

The restorewatcher files in conflict have been deleted from develop branch.

```
# Conflicts:
# apiserver/params/charms.go
# caas/kubernetes/provider/bootstrap_test.go
# charmhub/refresh.go
# go.mod
# go.sum
# state/open.go
# worker/restorewatcher/manifold.go
# worker/restorewatcher/manifold_test.go
# worker/restorewatcher/worker.go
# worker/restorewatcher/worker_test.go
```

## QA steps

See PRs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants