projects/reconstructed
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Variable cache - Reset after block execution

Browse source 
* When a block is done executing, local variables must be restored to
    their previous values ; however, host variables may have been
    updated inside the block. Therefore it is necessary to reset the
    variable cache.
This commit is contained in:
Emmanuel BENOîT 2022-09-04 23:16:56 +02:00
parent d1d997f7ae
commit 57bf02e79d
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
inventory_plugins/reconstructed.py
View file

@ -622,33 +622,37 @@ class RciBlock(RcInstruction):
or self._always is None or self._always is None
or self._locals is None or self._locals is None
) )
merged_vars = merged_vars.copy() mv_copy = merged_vars.copy()
script_vars = script_vars.copy() sv_copy = script_vars.copy()
self._templar.available_variables = merged_vars self._templar.available_variables = mv_copy
for key, value in self._locals.items(): for key, value in self._locals.items():
result = self._templar.template(value) result = self._templar.template(value)
script_vars[key] = result sv_copy[key] = result
merged_vars[key] = result mv_copy[key] = result
self._display.vvv("- set block-local %s to %s" % (key, result)) self._display.vvv("- set block-local %s to %s" % (key, result))
try: try:
try: try:
self._display.vvv("- running 'block' instructions") self._display.vvv("- running 'block' instructions")
return self.run_block( return self.run_block(
self._block, host_name, merged_vars, host_vars, script_vars self._block, host_name, mv_copy, host_vars, sv_copy
) )
except AnsibleError as e: except AnsibleError as e:
if not self._rescue: if not self._rescue:
self._display.vvv("- block failed") self._display.vvv("- block failed")
raise raise
self._display.vvv("- block failed, running 'rescue' instructions") self._display.vvv("- block failed, running 'rescue' instructions")
script_vars["reconstructed_error"] = str(e) sv_copy["reconstructed_error"] = str(e)
merged_vars["reconstructed_error"] = str(e) mv_copy["reconstructed_error"] = str(e)
return self.run_block( return self.run_block(
self._rescue, host_name, merged_vars, host_vars, script_vars self._rescue, host_name, mv_copy, host_vars, sv_copy
) )
finally: finally:
self._display.vvv("- block exited, running 'always' instructions") self._display.vvv("- block exited, running 'always' instructions")
self.run_block(self._always, host_name, merged_vars, host_vars, script_vars) self.run_block(self._always, host_name, mv_copy, host_vars, sv_copy)
# Reset merged vars, as the host vars may have changed.
merged_vars.clear()
merged_vars.update(host_vars)
merged_vars.update(script_vars)
def run_block(self, block, host_name, merged_vars, host_vars, script_vars): def run_block(self, block, host_name, merged_vars, host_vars, script_vars):
for instruction in block: for instruction in block: