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

Use ansible-runner imports for cpu and memory calculation (#10954)

Browse Source 
* Use ansible-runner imports for cpu and memory calculation

* Fix bug with capacity and memory adjustment
This commit is contained in:
Alan Rominger
2021-08-27 21:46:53 -04:00
committed by GitHub
parent db34423af8
commit 424dbe8208
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/ha.py
View File

@@ -22,9 +22,12 @@ from awx.main.managers import InstanceManager, InstanceGroupManager
from awx.main.fields import JSONField
from awx.main.models.base import BaseModel, HasEditsMixin, prevent_search
from awx.main.models.unified_jobs import UnifiedJob
from awx.main.utils.common import measure_cpu, get_corrected_cpu, get_cpu_effective_capacity, measure_memory, get_corrected_memory, get_mem_effective_capacity
from awx.main.utils.common import get_corrected_cpu, get_cpu_effective_capacity, get_corrected_memory, get_mem_effective_capacity
from awx.main.models.mixins import RelatedJobsMixin
# ansible-runner
from ansible_runner.utils.capacity import get_cpu_count, get_mem_in_bytes
__all__ = ('Instance', 'InstanceGroup', 'TowerScheduleState')
logger = logging.getLogger('awx.main.models.ha')
@@ -222,7 +225,7 @@ class Instance(HasPolicyEditsMixin, BaseModel):
except redis.ConnectionError:
has_error = True
self.save_health_data(awx_application_version, measure_cpu(), measure_memory(), last_seen=now(), has_error=has_error)
self.save_health_data(awx_application_version, get_cpu_count(), get_mem_in_bytes(), last_seen=now(), has_error=has_error)
class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin):