dont clobber facts in loop (#71032) (#71095)

(cherry picked from commit f9af27c631)

changelogs/fragments/no_fact_loop_loss.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - avoid clobbering existing facts inside loop when task also returns ansible_facts.

lib/ansible/executor/task_executor.py

@@ -719,7 +719,7 @@ class TaskExecutor:
                 else:
                     # TODO: cleaning of facts should eventually become part of taskresults instead of vars
                     af = wrap_var(result['ansible_facts'])
-                    vars_copy.update(namespace_facts(af))
+                    vars_copy['ansible_facts'] = combine_vars(vars_copy.get('ansible_facts', {}), namespace_facts(af))
                     if C.INJECT_FACTS_AS_VARS:
                         vars_copy.update(clean_facts(af))
 
@@ -783,7 +783,7 @@ class TaskExecutor:
             else:
                 # TODO: cleaning of facts should eventually become part of taskresults instead of vars
                 af = wrap_var(result['ansible_facts'])
-                variables.update(namespace_facts(af))
+                variables['ansible_facts'] = combine_vars(variables.get('ansible_facts', {}), namespace_facts(af))
                 if C.INJECT_FACTS_AS_VARS:
                     variables.update(clean_facts(af))
 

test/integration/targets/gathering_facts/prevent_clobbering.yml

@@ -0,0 +1,8 @@
+- name: Verify existing facts don't go undefined on unrelated new facts in loop
+  hosts: localhost
+  gather_facts: True
+  tasks:
+  - name: Ensure that 'virtualization_type' is not undefined after first loop iteration
+    bogus_facts:
+    loop: [1, 2, 3]
+    when: ansible_facts['virtualization_type'] != 'NotDocker'

test/integration/targets/gathering_facts/runme.sh

@@ -13,3 +13,6 @@ ansible-playbook test_prevent_injection.yml -i inventory -v "$@"
 
 # ensure fact merging is working properly
 ansible-playbook verify_merge_facts.yml -v "$@" -e 'ansible_facts_parallel: False'
+
+# ensure we dont clobber facts in loop
+ansible-playbook prevent_clobbering.yml -v "$@"