Optimize & fix unit removal #967
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
Currently it's calling the API for each unit to be destroyed. This changes it so that we're only calling the API only once.
jack-w-shaw
approved these changes
Oct 23, 2023
juju/model.py
Outdated
| 'max-wait': max_wait, | ||
| 'dry-run': dry_run, | ||
| }]) | ||
| await self.destroy_units(unit_id, destroy_storage, dry_run, force, max_wait) |
There was a problem hiding this comment.
Could the last 4 args be kwargs? I don't know exactly how python handles variadic positional / ket word args, but this seems a little fragile to me. It seems like later args could be misinterpreted as unit_names with only a small change?
There was a problem hiding this comment.
I think you're right, this call needs to be fixed, but changing the args on the definition would mean changing the API in a run-by, which a lot of users would be upset about. That needs to be done in a major release.
I also realized we're not returning the result here (mostly because this is called only for its side-effect, but nevertheless). I'll fix it, thanks for the heads up 👍
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 23, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
|
/merge |
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 24, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 24, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 24, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 24, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
|
/merge |
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 26, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
jack-w-shaw
added a commit
to jack-w-shaw/python-libjuju
that referenced
this pull request
Oct 26, 2023
Check if the switch param is pointing to a local charm. If it is, run local_refresh as if it were provided This is how the Juju CLI works, which was missing from pylibjuju. Replicate this. Also push url parsing of switch kwarg behind a check if it's local charm, meaning we avoid the possibility where we attempt to parse a path as if it were a url Resolves juju#967
Merged
jujubot
added a commit
that referenced
this pull request
Oct 26, 2023
#980 ## What's Changed * Repository Maintenance Improvements by @cderici in #922 * Stale bot to not bother feature requests by @cderici in #926 * Fix linter issues by @cderici in #928 * Fix docstring typo by @DanielArndt in #927 * Fix asyncio on README by @marceloneppel in #930 * Fix integration/test_application.test_action by @cderici in #932 * Update 3.2 facade clients by @cderici in #931 * [JUJU-4488] Add licence headers to source files on 3.x by @cderici in #934 * Update async tests to use builtin python suite by @DanielArndt in #935 * Pass correct charm url to series selector by @cderici in #942 * Green CI cleanup for python-libjuju by @cderici in #939 * Bring forward support for nested assumes expressions on 3x by @cderici in #943 * Release 3.2.2.0 notes by @cderici in #945 * Cleanup release process for 3.x by @cderici in #946 * Use new DeployFromRepository endpoint for deploy by @cderici in #949 * Handle pending upload resources deployfromrepository by @cderici in #953 * Optimize connection teardown by @cderici in #952 * Use `log.warning` instead of the deprecated `warn` by @sed-i in #954 * Find controller name by endpoint on 3.x track by @cderici in #966 * Optimize & fix unit removal by @cderici in #967 * Allow switch kwarg in refresh to switch to local charms by @jack-w-shaw in #971 * Parse charm URLs consistantly for local charms by @jack-w-shaw in #974 * Juju config directory location fix on 3.x by @cderici in #976 * [JUJU-4779] Ensure valid charm origin for local charm switches by @jack-w-shaw in #978 * Application refresh with resources on 3.x by @cderici in #973 #### Notes & Discussion JUJU-4851 [JUJU-4488]: https://warthogs.atlassian.net/browse/JUJU-4488?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-4779]: https://warthogs.atlassian.net/browse/JUJU-4779?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.
Description
This change does two things:
unit.destroy(...)references unitnamerather than unittag#950 as @addyess suggested.model.destroy_unitswhere currently we're calling the API (ApplicationFacade.DestroyUnits) for each unit to be destroyed. This changes it so that the API is called only once with the list of the units.Fixes #950
QA Steps
Added an integration test for the first case:
For the
model.destroy_units()we already have a test:Additionally, we also have a bunch of tests that use the
model.destroy_units(), so they should be passing as well in the CI.All CI tests need to pass.
Notes & Discussion
Normally it should be the case where the
model.destroy_units()would use theUnit.destroy()on the Unit object. However, doing that for multiple units would be either inefficient (callu.destroy()for each unit -- thereby having the same inefficiency that we currently have), or a bit awkward since a unit would be requesting removal for other units. That's why we keep themodel.destroy_units, as well as theunit.destroy()essentially doing the same thing.