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

Merge pull request #156 from swills/portable-get_system_task_capacity

Browse Source 
Make get_system_task_capacity portable
This commit is contained in:
Matthew Jones
2017-09-13 10:19:12 -07:00
committed by GitHub
parent 2dda863baf 769ee8ac54
commit ca094f0e86
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/utils/common.py
View File

@@ -17,6 +17,7 @@ import threading
import contextlib import contextlib
import tempfile import tempfile
import six import six
import psutil
# Decorator # Decorator
from decorator import decorator from decorator import decorator
@@ -581,15 +582,11 @@ def get_system_task_capacity():
from django.conf import settings from django.conf import settings
if hasattr(settings, 'SYSTEM_TASK_CAPACITY'): if hasattr(settings, 'SYSTEM_TASK_CAPACITY'):
return settings.SYSTEM_TASK_CAPACITY return settings.SYSTEM_TASK_CAPACITY
try: mem = psutil.virtual_memory()
out = subprocess.check_output(['free', '-m']) total_mem_value = mem.total / 1024 / 1024
except subprocess.CalledProcessError: if total_mem_value <= 2048:
logger.exception('Problem obtaining capacity from system.')
return 0
total_mem_value = out.split()[7]
if int(total_mem_value) <= 2048:
return 50 return 50
return 50 + ((int(total_mem_value) / 1024) - 2) * 75 return 50 + ((total_mem_value / 1024) - 2) * 75
_inventory_updates = threading.local() _inventory_updates = threading.local()