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

Merge pull request #3833 from ryanpetrello/iso-mem-cpu

Browse Source 
properly record Instance.cpu and Instance.memory for isolated nodes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-05-06 16:14:18 +00:00
committed by GitHub
parent 4dc7178f3c c6c14d4fb9
commit 6908558acd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,12 +299,14 @@ class IsolatedManager(object):
if instance.capacity == 0 and task_result['capacity_cpu']: if instance.capacity == 0 and task_result['capacity_cpu']:
logger.warning('Isolated instance {} has re-joined.'.format(instance.hostname)) logger.warning('Isolated instance {} has re-joined.'.format(instance.hostname))
instance.cpu = int(task_result['cpu'])
instance.memory = int(task_result['mem'])
instance.cpu_capacity = int(task_result['capacity_cpu']) instance.cpu_capacity = int(task_result['capacity_cpu'])
instance.mem_capacity = int(task_result['capacity_mem']) instance.mem_capacity = int(task_result['capacity_mem'])
instance.capacity = get_system_task_capacity(scale=instance.capacity_adjustment, instance.capacity = get_system_task_capacity(scale=instance.capacity_adjustment,
cpu_capacity=int(task_result['capacity_cpu']), cpu_capacity=int(task_result['capacity_cpu']),
mem_capacity=int(task_result['capacity_mem'])) mem_capacity=int(task_result['capacity_mem']))
instance.save(update_fields=['cpu_capacity', 'mem_capacity', 'capacity', 'version', 'modified']) instance.save(update_fields=['cpu', 'memory', 'cpu_capacity', 'mem_capacity', 'capacity', 'version', 'modified'])
def health_check(self, instance_qs): def health_check(self, instance_qs):
''' '''
@@ -343,6 +345,8 @@ class IsolatedManager(object):
logger.exception('Failed to read status from isolated instances') logger.exception('Failed to read status from isolated instances')
if 'awx_capacity_cpu' in task_result and 'awx_capacity_mem' in task_result: if 'awx_capacity_cpu' in task_result and 'awx_capacity_mem' in task_result:
task_result = { task_result = {
'cpu': task_result['awx_cpu'],
'mem': task_result['awx_mem'],
'capacity_cpu': task_result['awx_capacity_cpu'], 'capacity_cpu': task_result['awx_capacity_cpu'],
'capacity_mem': task_result['awx_capacity_mem'], 'capacity_mem': task_result['awx_capacity_mem'],
'version': task_result['awx_capacity_version'] 'version': task_result['awx_capacity_version']

6
awx/plugins/isolated/awx_capacity.py
View File

@@ -57,13 +57,15 @@ def main():
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
return return
# NOTE: Duplicated with awx.main.utils.common capacity utilities # NOTE: Duplicated with awx.main.utils.common capacity utilities
_, capacity_cpu = get_cpu_capacity() cpu, capacity_cpu = get_cpu_capacity()
_, capacity_mem = get_mem_capacity() mem, capacity_mem = get_mem_capacity()
# Module never results in a change # Module never results in a change
module.exit_json(changed=False, capacity_cpu=capacity_cpu, module.exit_json(changed=False, capacity_cpu=capacity_cpu,
capacity_mem=capacity_mem, version=version, capacity_mem=capacity_mem, version=version,
ansible_facts=dict( ansible_facts=dict(
awx_cpu=cpu,
awx_mem=mem,
awx_capacity_cpu=capacity_cpu, awx_capacity_cpu=capacity_cpu,
awx_capacity_mem=capacity_mem, awx_capacity_mem=capacity_mem,
awx_capacity_version=version awx_capacity_version=version