internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

include_role handlers bug fix (#26335)

Browse Source 
* Ensure that include_role properly fires handlers

include_role needs to ensure that any handlers included
with the role are added to the _notified_handler and
_listening_handler lists of the TaskQueueManager, otherwise
it fails when trying to run the handler.

Additionally, the handler needs to be added to the
PlayIterator's `_uuid_cache` or it fails after running
the handler

Add more uuid debug statements - this code was hard
to debug with existing debug statements, so add more
uuid information at little additional output cost.

Fixes #18411

* Add tests for include_role handlers

Tests for #18411
This commit is contained in:
Will Thames
2017-07-20 06:02:32 +10:00
committed by James Cammarata
parent 2e073e73d2
commit ef8c9798d3
13 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/executor/process/worker.py
View File

@@ -118,7 +118,7 @@ class WorkerProcess(multiprocessing.Process):
self._rslt_q
).run()
display.debug("done running TaskExecutor() for %s/%s" % (self._host, self._task))
display.debug("done running TaskExecutor() for %s/%s [%s]" % (self._host, self._task, self._task._uuid))
self._host.vars = dict()
self._host.groups = []
task_result = TaskResult(
@@ -129,9 +129,9 @@ class WorkerProcess(multiprocessing.Process):
)
# put the result on the result queue
display.debug("sending task result")
display.debug("sending task result for task %s" % self._task._uuid)
self._rslt_q.put(task_result)
display.debug("done sending task result")
display.debug("done sending task result for task %s" % self._task._uuid)
except AnsibleConnectionFailure:
self._host.vars = dict()

2
lib/ansible/executor/task_executor.py
View File

@@ -81,7 +81,7 @@ class TaskExecutor:
returned as a dict.
'''
display.debug("in run()")
display.debug("in run() - task %s" % self._task._uuid)
try:
try:

6
lib/ansible/executor/task_queue_manager.py
View File

@@ -137,10 +137,13 @@ class TaskQueueManager:
handler_list = []
for handler_block in play.handlers:
handler_list.extend(_process_block(handler_block))
# then initialize it with the given handler list
self.update_handler_list(handler_list)
def update_handler_list(self, handler_list):
for handler in handler_list:
if handler._uuid not in self._notified_handlers:
display.debug("Adding handler %s to notified list" % handler.name)
self._notified_handlers[handler._uuid] = []
if handler.listen:
listeners = handler.listen
@@ -149,6 +152,7 @@ class TaskQueueManager:
for listener in listeners:
if listener not in self._listening_handlers:
self._listening_handlers[listener] = []
display.debug("Adding handler %s to listening list" % handler.name)
self._listening_handlers[listener].append(handler._uuid)
def load_callbacks(self):