mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-25 22:30:22 -07:00
Ensure we only cache the loop when the task had a loop (#44901)
* Further restrict caching of loop when the task actually had a loop. Fixes #44874 * Extend tests for loop caching
This commit is contained in:
parent
6059da245b
commit
9d89e15ff0
3 changed files with 19 additions and 1 deletions
2
changelogs/fragments/loop-cache-fix.yaml
Normal file
2
changelogs/fragments/loop-cache-fix.yaml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- loop - Ensure we only cache the loop when the task had a loop and delegate_to was templated (https://github.com/ansible/ansible/issues/44874)
|
|
@ -494,6 +494,7 @@ class VariableManager:
|
||||||
templar = Templar(loader=self._loader, variables=vars_copy)
|
templar = Templar(loader=self._loader, variables=vars_copy)
|
||||||
|
|
||||||
items = []
|
items = []
|
||||||
|
has_loop = True
|
||||||
if task.loop_with is not None:
|
if task.loop_with is not None:
|
||||||
if task.loop_with in lookup_loader:
|
if task.loop_with in lookup_loader:
|
||||||
try:
|
try:
|
||||||
|
@ -509,6 +510,7 @@ class VariableManager:
|
||||||
elif task.loop is not None:
|
elif task.loop is not None:
|
||||||
items = templar.template(task.loop)
|
items = templar.template(task.loop)
|
||||||
else:
|
else:
|
||||||
|
has_loop = False
|
||||||
items = [None]
|
items = [None]
|
||||||
|
|
||||||
delegated_host_vars = dict()
|
delegated_host_vars = dict()
|
||||||
|
@ -583,7 +585,7 @@ class VariableManager:
|
||||||
include_hostvars=False,
|
include_hostvars=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
if cache_items:
|
if has_loop and cache_items:
|
||||||
# delegate_to templating produced a change, update task.loop with templated items,
|
# delegate_to templating produced a change, update task.loop with templated items,
|
||||||
# this ensures that delegate_to+loop doesn't produce different results than TaskExecutor
|
# this ensures that delegate_to+loop doesn't produce different results than TaskExecutor
|
||||||
# which may reprocess the loop
|
# which may reprocess the loop
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
add_host:
|
add_host:
|
||||||
name: "foo{{item}}"
|
name: "foo{{item}}"
|
||||||
groups: foo
|
groups: foo
|
||||||
|
ansible_connection: local
|
||||||
loop: "{{ range(10)|list }}"
|
loop: "{{ range(10)|list }}"
|
||||||
|
|
||||||
# We expect all of the next 3 runs to succeeed
|
# We expect all of the next 3 runs to succeeed
|
||||||
|
@ -56,3 +57,16 @@
|
||||||
- "{{ (result1.results|first) is successful }}"
|
- "{{ (result1.results|first) is successful }}"
|
||||||
- "{{ (result2.results|first) is successful }}"
|
- "{{ (result2.results|first) is successful }}"
|
||||||
- "{{ (result3.results|first) is successful }}"
|
- "{{ (result3.results|first) is successful }}"
|
||||||
|
|
||||||
|
- name: Set delegate
|
||||||
|
set_fact:
|
||||||
|
_delegate: '{{ groups.foo[0] }}'
|
||||||
|
|
||||||
|
- command: "true"
|
||||||
|
delegate_to: "{{ _delegate }}"
|
||||||
|
register: result
|
||||||
|
|
||||||
|
- assert:
|
||||||
|
that:
|
||||||
|
- result.stdout is defined
|
||||||
|
- result.results is undefined
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue