External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12749 from shanemcd/not-so-aggressive

Browse Source 
Make error handling less aggressive when checking status of dispatcher task
This commit is contained in:
Shane McDonald
2022-08-29 11:50:56 -04:00
committed by GitHub
parent 3f0f538c40 457dd890cb
commit 696f099940
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/models/unified_jobs.py
View File

@@ -1406,9 +1406,10 @@ class UnifiedJob(
timeout = 5 timeout = 5
try: try:
running = self.celery_task_id in ControlDispatcher('dispatcher', self.controller_node or self.execution_node).running(timeout=timeout) running = self.celery_task_id in ControlDispatcher('dispatcher', self.controller_node or self.execution_node).running(timeout=timeout)
except (socket.timeout, RuntimeError): except socket.timeout:
logger.error('could not reach dispatcher on {} within {}s'.format(self.execution_node, timeout)) logger.error('could not reach dispatcher on {} within {}s'.format(self.execution_node, timeout))
running = False except Exception:
logger.exception("error encountered when checking task status")
return running return running
@property @property