cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only apply the unroll wrapper once (#72003) (#72017)

Browse source 
Co-authored-by: Matt Martz <matt@sivel.net>

Fixes #71920

(cherry picked from commit 4197666179)
This commit is contained in:
Martin Krizek 2020-10-21 22:32:45 +02:00 committed by GitHub
parent cd89aadec1
commit d53d247c84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/71920-fix-templating-recursion-error.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fix ``RecursionError`` when templating large vars structures (https://github.com/ansible/ansible/issues/71920)

2
lib/ansible/template/__init__.py
View file

@ -257,6 +257,7 @@ def _unroll_iterator(func):
return list(ret) return list(ret)
return ret return ret
wrapper.__UNROLLED__ = True
return _update_wrapper(wrapper, func) return _update_wrapper(wrapper, func)
@ -1025,6 +1026,7 @@ class Templar:
# Adds Ansible custom filters and tests # Adds Ansible custom filters and tests
myenv.filters.update(self._get_filters()) myenv.filters.update(self._get_filters())
for k in myenv.filters: for k in myenv.filters:
if not getattr(myenv.filters[k], '__UNROLLED__', False):
myenv.filters[k] = _unroll_iterator(myenv.filters[k]) myenv.filters[k] = _unroll_iterator(myenv.filters[k])
myenv.tests.update(self._get_tests()) myenv.tests.update(self._get_tests())