[JUJU-592] LP1960235 worker does not stop #13717
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
Fixes LP1960235. Otherwise the #-container-watcher worker does not respond appropriately when the unconverted-api-workers manifold is stopping for migration or juju upgrades.
These run inside the unconverted-api-workers and their state changes are not always obvious. Allow for more detail from the runner.
wallyworld
approved these changes
Feb 9, 2022
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Feb 21, 2022
#13757 Merge 2.9 #13693 [JUJU-416] Consistantly use juju/retry to handle retries 8 (worker/upgradesteps/*) #13705 Ensure we check trace enabled before heavy operations #13711 [JUJU-585] Increase SA secret bootstrap time out. #13715 [JUJU-587] Tweak cpu power so test passes #13719 [JUJU-575] Fix/nw deploy kubeflow #13686 [JUJU-416] Consistantly use juju/retry to handle retries 6 (provider/gce/*) #13716 [JUJU-586] Supply OpenStack FIPs to the instance-polle #13718 Add Darwin support for uploading Microk8s images #13722 Fixes Juju to handle microk8s not running #13724 [JUJU-575] Reset in kubeflow dir; #13723 [JUJU-256] Add microk8s tests for upgrade model actions #13727 [JUJU-600] Add log diff debug message for assess_model_migration.py #13717 [JUJU-592] LP1960235 worker does not stop #13714 Fix multiwatcher data race #13729 [JUJU-603] Remove client websocket buffer size stipulation #13731 Added --no-progress argument to juju download. #13733 Fix manual machine checks when migrating manual models #13728 [JUJU-394] Improve enable-ha error message #13721 Move lxd profile watcher from model cache to apiserver layer Conflicts due to version bump and removal of actions UUID support. ``` # Conflicts: # .github/workflows/smoke.yml # apiserver/allfacades.go # apiserver/facades/client/action/action_test.go # apiserver/facades/client/client/client.go # go.sum # scripts/win-installer/setup.iss # snap/snapcraft.yaml # state/action_test.go # state/operation_test.go # version/version.go # worker/uniter/runner/context/context_test.go ``` ## QA steps See PRs [JUJU-416]: https://warthogs.atlassian.net/browse/JUJU-416?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-585]: https://warthogs.atlassian.net/browse/JUJU-585?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-587]: https://warthogs.atlassian.net/browse/JUJU-587?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-575]: https://warthogs.atlassian.net/browse/JUJU-575?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-416]: https://warthogs.atlassian.net/browse/JUJU-416?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-586]: https://warthogs.atlassian.net/browse/JUJU-586?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-575]: https://warthogs.atlassian.net/browse/JUJU-575?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-256]: https://warthogs.atlassian.net/browse/JUJU-256?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-600]: https://warthogs.atlassian.net/browse/JUJU-600?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-592]: https://warthogs.atlassian.net/browse/JUJU-592?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-603]: https://warthogs.atlassian.net/browse/JUJU-603?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-394]: https://warthogs.atlassian.net/browse/JUJU-394?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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.
The unconverted-api-workers manifold was failing to quiesce for model migration or for agent upgrades. The #-container-worker was stopped, but not gone, causing the manifold to stay in "stopping".
Include the abort channel when calling StopAndRemoveWorker for #-container-worker, otherwise it is stopped, but never goes away correctly due to the differences in return errors with StopWorker. More investigation is needed around this. As well as finally writing manifolds to move the unconverted-api-workers into their appropriate locations.
QA steps
The following test is for migration, also a test for upgrade-juju should not require the machine agent to be bounced for success.
Bug reference
https://bugs.launchpad.net/juju/+bug/1960235