fix loading vars_plugins in roles #82273
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
use vars_loader as the source of truth by changing it to an ordered dict ci_complete
ansibot
added
bug
…n't cache in all()
s-hertel
force-pushed
the
fix-clearing-vars-plugin-cache
branch
from
5ebc1e7
to
a97f73b
Compare
ansibot
removed
the
needs_revision
s-hertel
force-pushed
the
fix-clearing-vars-plugin-cache
branch
from
0de2af4
to
5b413e5
Compare
sivel
reviewed
Nov 27, 2023
bcoca
removed
the
needs_triage
ansibot
added
the
stale_ci
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ansibot
removed
the
stale_ci
Simplify, comment code
ansibot
added
needs_revision
s-hertel
commented
Jan 16, 2024
s-hertel
commented
Jan 16, 2024
Comment on lines
+83
to
+85
| if vars_loader._paths is None: | ||
| # cache has been reset, reload all() | ||
| _prime_vars_loader() |
There was a problem hiding this comment.
I used vars_loader._paths here as opposed to (for example) vars_loader._search_paths because I'm assuming we don't want to extend OLD_PLUGIN_CACHE_CLEARING to new caches.
I moved this into the vars plugin loader too. <- Actually can't, it duplicates any stateless enabled plugins.
s-hertel
force-pushed
the
fix-clearing-vars-plugin-cache
branch
from
1697252
to
3711be8
Compare
s-hertel
added a commit
to s-hertel/ansible
that referenced
this pull request
Jan 26, 2024
* Fix loading legacy vars plugins when the plugin loader cache is reset * Remove extra cache layer by ensuring vars plugin names are cached (stateless or not) so that the plugin loader cache can double as the load order (cherry picked from commit 13e6d84)
sivel
pushed a commit
that referenced
this pull request
Feb 14, 2024
* Fix loading legacy vars plugins when the plugin loader cache is reset * Remove extra cache layer by ensuring vars plugin names are cached (stateless or not) so that the plugin loader cache can double as the load order (cherry picked from commit 13e6d84)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
Fixes #82239
Adding a new role dir to the plugin loader clears the plugin loader cache, but the variable
cached_vars_plugin_orderin ansible.vars.plugins is never reset, preventing new plugins from being found.Remove cache in the middle and use the vars plugin loader cache as the load-order. To make this possible, the cache keys now include non-stateless vars plugins (the value is a None, unresolved PluginLoadContext() tuple to be easily distinguished from stateless plugins).
ISSUE TYPE
ADDITIONAL INFORMATION