From 3dc5ba618622add48fc341eed6a9b8c46c823809 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 17 Jan 2019 08:29:26 +0100 Subject: [PATCH] Remove unnecessary calls to cache_block_tasks noop (#50715) --- lib/ansible/executor/play_iterator.py | 5 ----- lib/ansible/plugins/strategy/__init__.py | 1 - 2 files changed, 6 deletions(-) diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 665e3fe1810..92ab0bed764 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -192,17 +192,12 @@ class PlayIterator: setup_block = setup_block.filter_tagged_tasks(play_context, all_vars) self._blocks.append(setup_block) - self.cache_block_tasks(setup_block) for block in self._play.compile(): new_block = block.filter_tagged_tasks(play_context, all_vars) if new_block.has_tasks(): - self.cache_block_tasks(new_block) self._blocks.append(new_block) - for handler_block in self._play.handlers: - self.cache_block_tasks(handler_block) - self._host_states = {} start_at_matched = False batch = inventory.get_hosts(self._play.hosts) diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py index 4c98ab023e2..40dfc8f0912 100644 --- a/lib/ansible/plugins/strategy/__init__.py +++ b/lib/ansible/plugins/strategy/__init__.py @@ -909,7 +909,6 @@ class StrategyBase: # of hosts which included the file to the notified_handlers dict for block in new_blocks: iterator._play.handlers.append(block) - iterator.cache_block_tasks(block) for task in block.block: task_name = task.get_name() display.debug("adding task '%s' included in handler '%s'" % (task_name, handler_name))