Remove unnecessary calls to cache_block_tasks noop (#50715)

pull/51011/head
Martin Krizek 6 years ago committed by GitHub
parent e150943314
commit 3dc5ba6186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -192,17 +192,12 @@ class PlayIterator:
setup_block = setup_block.filter_tagged_tasks(play_context, all_vars) setup_block = setup_block.filter_tagged_tasks(play_context, all_vars)
self._blocks.append(setup_block) self._blocks.append(setup_block)
self.cache_block_tasks(setup_block)
for block in self._play.compile(): for block in self._play.compile():
new_block = block.filter_tagged_tasks(play_context, all_vars) new_block = block.filter_tagged_tasks(play_context, all_vars)
if new_block.has_tasks(): if new_block.has_tasks():
self.cache_block_tasks(new_block)
self._blocks.append(new_block) self._blocks.append(new_block)
for handler_block in self._play.handlers:
self.cache_block_tasks(handler_block)
self._host_states = {} self._host_states = {}
start_at_matched = False start_at_matched = False
batch = inventory.get_hosts(self._play.hosts) batch = inventory.get_hosts(self._play.hosts)

@ -909,7 +909,6 @@ class StrategyBase:
# of hosts which included the file to the notified_handlers dict # of hosts which included the file to the notified_handlers dict
for block in new_blocks: for block in new_blocks:
iterator._play.handlers.append(block) iterator._play.handlers.append(block)
iterator.cache_block_tasks(block)
for task in block.block: for task in block.block:
task_name = task.get_name() task_name = task.get_name()
display.debug("adding task '%s' included in handler '%s'" % (task_name, handler_name)) display.debug("adding task '%s' included in handler '%s'" % (task_name, handler_name))

Loading…
Cancel
Save