saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix broken jinja imports in masterless salt-call

Browse source 
The addition of fileclient caching in the JinjaCacheLoader has broken
all jinja imports in state files, in masterless salt-call runs. This is
because masterless Pillar compilation uses the `PillarClient` while
regular file caching (states, etc.) use the `LocalClient`. Since Pillar
is compiled first in the masterless run, the class-level attribute where
the cached fileclient is stored only ever usese the PillarClient, and
thus any Jinja imports will cache the templates to the wrong location
(under `pillar_roots`).

This expands the cached fileclient support to distinguish between pillar
and non-pillar, and keep a separate cached fileclient for each.
This commit is contained in:
Erik Johnson 2019-09-26 12:16:50 -05:00 • committed by Daniel A. Wozniak
parent 7912b67a9a
commit 3925bb7793
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
salt/utils/jinja.py
View file

@ -56,16 +56,18 @@ class SaltCacheLoader(BaseLoader):
and only loaded once per loader instance.
'''
_cached_pillar_client = None
_cached_client = None
@classmethod
def shutdown(cls):
if cls._cached_client is None:
return
# PillarClient and LocalClient objects do not have a destroy method
if hasattr(cls._cached_client, 'destroy'):
cls._cached_client.destroy()
cls._cached_client = None
for attr in ('_cached_client', '_cached_pillar_client'):
client = getattr(cls, attr, None)
if client is not None:
# PillarClient and LocalClient objects do not have a destroy method
if hasattr(client, 'destroy'):
client.destroy()
setattr(cls, attr, None)
def __init__(self, opts, saltenv='base', encoding='utf-8',
pillar_rend=False, _file_client=None):
@ -94,10 +96,12 @@ class SaltCacheLoader(BaseLoader):
# and use that. This avoids opening a new file_client every time this
# class is instantiated
if self._file_client is None:
if not SaltCacheLoader._cached_client:
SaltCacheLoader._cached_client = salt.fileclient.get_file_client(
self.opts, self.pillar_rend)
self._file_client = SaltCacheLoader._cached_client
attr = '_cached_pillar_client' if self.pillar_rend else '_cached_client'
cached_client = getattr(self, attr, None)
if cached_client is None:
cached_client = salt.fileclient.get_file_client(self.opts, self.pillar_rend)
setattr(SaltCacheLoader, attr, cached_client)
self._file_client = cached_client
return self._file_client
def cache_file(self, template):