External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 09:18:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5382 from shanemcd/take-your-time

Browse Source 
Remove usage of idle_timeout when checking status of isolated / containerized jobs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-11-22 18:37:14 +00:00
committed by GitHub
parent bc7ae4ca46 db2316b791
commit caa6d0c4d3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/isolated/manager.py
View File

@@ -40,7 +40,6 @@ class IsolatedManager(object):
""" """
self.cancelled_callback = cancelled_callback self.cancelled_callback = cancelled_callback
self.check_callback = check_callback self.check_callback = check_callback
self.idle_timeout = max(60, 2 * settings.AWX_ISOLATED_CONNECTION_TIMEOUT)
self.started_at = None self.started_at = None
self.captured_command_artifact = False self.captured_command_artifact = False
self.instance = None self.instance = None
@@ -108,7 +107,6 @@ class IsolatedManager(object):
'verbosity': verbosity, 'verbosity': verbosity,
'cancel_callback': self.cancelled_callback, 'cancel_callback': self.cancelled_callback,
'settings': { 'settings': {
'idle_timeout': self.idle_timeout,
'job_timeout': settings.AWX_ISOLATED_LAUNCH_TIMEOUT, 'job_timeout': settings.AWX_ISOLATED_LAUNCH_TIMEOUT,
'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5), 'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5),
'suppress_ansible_output': True, 'suppress_ansible_output': True,
@@ -118,7 +116,7 @@ class IsolatedManager(object):
def path_to(self, *args): def path_to(self, *args):
return os.path.join(self.private_data_dir, *args) return os.path.join(self.private_data_dir, *args)
def run_management_playbook(self, playbook, private_data_dir, **kw): def run_management_playbook(self, playbook, private_data_dir, idle_timeout=None, **kw):
iso_dir = tempfile.mkdtemp( iso_dir = tempfile.mkdtemp(
prefix=playbook, prefix=playbook,
dir=private_data_dir dir=private_data_dir
@@ -126,6 +124,8 @@ class IsolatedManager(object):
params = self.runner_params.copy() params = self.runner_params.copy()
params['playbook'] = playbook params['playbook'] = playbook
params['private_data_dir'] = iso_dir params['private_data_dir'] = iso_dir
if idle_timeout:
params['settings']['idle_timeout'] = idle_timeout
params.update(**kw) params.update(**kw)
if all([ if all([
getattr(settings, 'AWX_ISOLATED_KEY_GENERATION', False) is True, getattr(settings, 'AWX_ISOLATED_KEY_GENERATION', False) is True,
@@ -177,6 +177,7 @@ class IsolatedManager(object):
logger.debug('Starting job {} on isolated host with `run_isolated.yml` playbook.'.format(self.instance.id)) logger.debug('Starting job {} on isolated host with `run_isolated.yml` playbook.'.format(self.instance.id))
runner_obj = self.run_management_playbook('run_isolated.yml', runner_obj = self.run_management_playbook('run_isolated.yml',
self.private_data_dir, self.private_data_dir,
idle_timeout=max(60, 2 * settings.AWX_ISOLATED_CONNECTION_TIMEOUT),
extravars=extravars) extravars=extravars)
if runner_obj.status == 'failed': if runner_obj.status == 'failed':