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

Set default value is 0 for idle_timeout

Browse Source
This commit is contained in:
Alexander Komarov
2021-08-19 14:48:11 +05:00
parent aa682fa2c9
commit 530977d6b3
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/conf.py
View File

@@ -412,9 +412,12 @@ register(
'DEFAULT_JOB_IDLE_TIMEOUT', 'DEFAULT_JOB_IDLE_TIMEOUT',
field_class=fields.IntegerField, field_class=fields.IntegerField,
min_value=0, min_value=0,
default=600, default=0,
label=_('Default Job Idle Timeout'), label=_('Default Job Idle Timeout'),
help_text=_('If no output is detected from ansible in this number of seconds the execution will be terminated.'), help_text=_(
'If no output is detected from ansible in this number of seconds the execution will be terminated. '
'Use value of 0 to used default idle_timeout is 600s.'
),
category=_('Jobs'), category=_('Jobs'),
category_slug='jobs', category_slug='jobs',
unit=_('seconds'), unit=_('seconds'),

4
awx/main/tasks.py
View File

@@ -1365,11 +1365,13 @@ class BaseTask(object):
'envvars': env, 'envvars': env,
'settings': { 'settings': {
'job_timeout': self.get_instance_timeout(self.instance), 'job_timeout': self.get_instance_timeout(self.instance),
'idle_timeout': settings.DEFAULT_JOB_IDLE_TIMEOUT,
'suppress_ansible_output': True, 'suppress_ansible_output': True,
}, },
} }
if settings.DEFAULT_JOB_IDLE_TIMEOUT > 0:
params['settings']['idle_timeout'] = settings.DEFAULT_JOB_IDLE_TIMEOUT
if isinstance(self.instance, AdHocCommand): if isinstance(self.instance, AdHocCommand):
params['module'] = self.build_module_name(self.instance) params['module'] = self.build_module_name(self.instance)
params['module_args'] = self.build_module_args(self.instance) params['module_args'] = self.build_module_args(self.instance)

2
awx/ui/src/screens/Setting/Jobs/JobsDetail/JobsDetail.test.js
View File

@@ -64,7 +64,7 @@ describe('<JobsDetail />', () => {
); );
assertDetail(wrapper, 'Maximum Scheduled Jobs', '10'); assertDetail(wrapper, 'Maximum Scheduled Jobs', '10');
assertDetail(wrapper, 'Default Job Timeout', '0 seconds'); assertDetail(wrapper, 'Default Job Timeout', '0 seconds');
assertDetail(wrapper, 'Default Job Idle Timeout', '600 seconds'); assertDetail(wrapper, 'Default Job Idle Timeout', '0 seconds');
assertDetail(wrapper, 'Default Inventory Update Timeout', '0 seconds'); assertDetail(wrapper, 'Default Inventory Update Timeout', '0 seconds');
assertDetail(wrapper, 'Default Project Update Timeout', '0 seconds'); assertDetail(wrapper, 'Default Project Update Timeout', '0 seconds');
assertDetail(wrapper, 'Per-Host Ansible Fact Cache Timeout', '0 seconds'); assertDetail(wrapper, 'Per-Host Ansible Fact Cache Timeout', '0 seconds');

2
awx/ui/src/screens/Setting/Jobs/JobsEdit/data.defaultJobSettings.json
View File

@@ -30,7 +30,7 @@
"AWX_TASK_ENV": {}, "AWX_TASK_ENV": {},
"DEFAULT_INVENTORY_UPDATE_TIMEOUT": 0, "DEFAULT_INVENTORY_UPDATE_TIMEOUT": 0,
"DEFAULT_JOB_TIMEOUT": 0, "DEFAULT_JOB_TIMEOUT": 0,
"DEFAULT_JOB_IDLE_TIMEOUT": 600, "DEFAULT_JOB_IDLE_TIMEOUT": 0,
"DEFAULT_PROJECT_UPDATE_TIMEOUT": 0, "DEFAULT_PROJECT_UPDATE_TIMEOUT": 0,
"GALAXY_IGNORE_CERTS": false, "GALAXY_IGNORE_CERTS": false,
"MAX_FORKS": 200, "MAX_FORKS": 200,

6
awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
View File

@@ -344,12 +344,12 @@
"type": "integer", "type": "integer",
"required": false, "required": false,
"label": "Default Job Idle Timeout", "label": "Default Job Idle Timeout",
"help_text": "If no output is detected from ansible in this number of seconds the execution will be terminated.", "help_text": "If no output is detected from ansible in this number of seconds the execution will be terminated. Use value of 0 to used default idle_timeout is 600s.",
"min_value": 0, "min_value": 0,
"category": "Jobs", "category": "Jobs",
"category_slug": "jobs", "category_slug": "jobs",
"unit": "seconds", "unit": "seconds",
"default": 600 "default": 0
}, },
"DEFAULT_INVENTORY_UPDATE_TIMEOUT": { "DEFAULT_INVENTORY_UPDATE_TIMEOUT": {
"type": "integer", "type": "integer",
@@ -4001,7 +4001,7 @@
"DEFAULT_JOB_IDLE_TIMEOUT": { "DEFAULT_JOB_IDLE_TIMEOUT": {
"type": "integer", "type": "integer",
"label": "Default Job Idle Timeout", "label": "Default Job Idle Timeout",
"help_text": "If no output is detected from ansible in this number of seconds the execution will be terminated.", "help_text": "If no output is detected from ansible in this number of seconds the execution will be terminated. Use value of 0 to used default idle_timeout is 600s.",
"min_value": 0, "min_value": 0,
"category": "Jobs", "category": "Jobs",
"category_slug": "jobs", "category_slug": "jobs",

2
awx/ui/src/screens/Setting/shared/data.allSettings.json
View File

@@ -49,7 +49,7 @@
"SCHEDULE_MAX_JOBS":10, "SCHEDULE_MAX_JOBS":10,
"AWX_ANSIBLE_CALLBACK_PLUGINS":[], "AWX_ANSIBLE_CALLBACK_PLUGINS":[],
"DEFAULT_JOB_TIMEOUT":0, "DEFAULT_JOB_TIMEOUT":0,
"DEFAULT_JOB_IDLE_TIMEOUT":600, "DEFAULT_JOB_IDLE_TIMEOUT":0,
"DEFAULT_INVENTORY_UPDATE_TIMEOUT":0, "DEFAULT_INVENTORY_UPDATE_TIMEOUT":0,
"DEFAULT_PROJECT_UPDATE_TIMEOUT":0, "DEFAULT_PROJECT_UPDATE_TIMEOUT":0,
"ANSIBLE_FACT_CACHE_TIMEOUT":0, "ANSIBLE_FACT_CACHE_TIMEOUT":0,

2
awx/ui/src/screens/Setting/shared/data.jobSettings.json
View File

@@ -17,7 +17,7 @@
"SCHEDULE_MAX_JOBS": 10, "SCHEDULE_MAX_JOBS": 10,
"AWX_ANSIBLE_CALLBACK_PLUGINS": [], "AWX_ANSIBLE_CALLBACK_PLUGINS": [],
"DEFAULT_JOB_TIMEOUT": 0, "DEFAULT_JOB_TIMEOUT": 0,
"DEFAULT_JOB_IDLE_TIMEOUT": 600, "DEFAULT_JOB_IDLE_TIMEOUT": 0,
"DEFAULT_INVENTORY_UPDATE_TIMEOUT": 0, "DEFAULT_INVENTORY_UPDATE_TIMEOUT": 0,
"DEFAULT_PROJECT_UPDATE_TIMEOUT": 0, "DEFAULT_PROJECT_UPDATE_TIMEOUT": 0,
"ANSIBLE_FACT_CACHE_TIMEOUT": 0, "ANSIBLE_FACT_CACHE_TIMEOUT": 0,