Refresh pillar cache when saltutil.refresh_pillar is run #60975
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
changelog/60897.fixed
Outdated
| @@ -0,0 +1,2 @@ | |||
| Clear and update the Pillar Cache when running saltutil.refresh_pillar. This only effects users | |||
There was a problem hiding this comment.
Should be "affects" here.
doc/topics/pillar/index.rst
Outdated
| @@ -386,6 +386,22 @@ updated pillar data, but :py:func:`pillar.item <salt.modules.pillar.item>`, | |||
| <salt.modules.pillar.raw>` will not see this data unless refreshed using | |||
| :py:func:`saltutil.refresh_pillar <salt.modules.saltutil.refresh_pillar>`. | |||
|
|
|||
| If your are using the Pillar Cache and have set :conf_master:`pillar_cache` to be `True`, | |||
There was a problem hiding this comment.
s/your/you/
Also, probably don't need to say "to be True", "to True" is probably OK.
salt/minion.py
Outdated
| @@ -2482,6 +2482,7 @@ def pillar_refresh(self, force_refresh=False): | |||
| self.opts["id"], | |||
| self.opts["saltenv"], | |||
| pillarenv=self.opts.get("pillarenv"), | |||
| force_refresh=True, | |||
There was a problem hiding this comment.
force_refresh is passed through elsewhere, should it really be hardcoded here rather than passing it through?
There was a problem hiding this comment.
This is a good point, I will make it configurable, so the user can choose not to refresh the pillar cache. I also think I am going to rename force_refresh, since this is a kwarg already used in saltutil.refresh_pillar used for refreshing modules.
Ch3LL
force-pushed
the
pillar_cache
branch
2 times, most recently
from
22ac03f
to
681d2cc
Compare
Ch3LL
changed the title
|
@terminalmage ready for re-review |
waynew
approved these changes
Oct 7, 2021
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.
What does this PR do?
When a user has
pillar_cacheset to True, the cache will not be refreshed when runningsalt \* saltutil.refresh_pillar. This PR adds the ability for the cache to be udpated when this is run. This PR still ensures when running a state or pillar.items for example it will not update the cache. When a user is running saltutil.refresh_pillar this would be intentional and would expect the cache to be updated.What issues does this PR fix or reference?
Fixes: #60897
Previous Behavior
salt \* saltutil.refresh_pillarwould not update the pillar cache.New Behavior
refresh_pillarno updates the pillar cache.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.