cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

facts: fix double-counting of CPUs on POWER systems (#58360)

Browse source 
On POWER systems, /proc/cpuinfo provides a 'processor' entry as a
counter, and a 'cpu' entry with a description (similar to 'model name'
on x86). Support for POWER in get_cpu_facts was added via the 'cpu'
entry in commit 8746e692c1.  Subsequent
support for ARM64 in commit ce4ada93f9
used the 'processor' entry, resulting in double-counting of cores on
POWER systems.

When unit tests were later written for this code in
commit 55306906cf, the erroneous values
were just accepted in the test instead of being diagnosed.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
This commit is contained in:
Yaakov Selkowitz 2019-08-09 13:01:29 -04:00 committed by Sam Doran
parent 2a9964ede8
commit 93d9d64038
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/facts/hardware/linux.py
View file

@ -242,8 +242,9 @@ class LinuxHardware(Hardware):
# The fields for ARM CPUs do not always include 'vendor_id' or 'model name',
# and sometimes includes both 'processor' and 'Processor'.
# Always use 'processor' count for ARM systems
if collected_facts.get('ansible_architecture', '').startswith(('armv', 'aarch')):
# The fields for Power CPUs include 'processor' and 'cpu'.
# Always use 'processor' count for ARM and Power systems
if collected_facts.get('ansible_architecture', '').startswith(('armv', 'aarch', 'ppc')):
i = processor_occurence
# FIXME

8
test/units/module_utils/facts/hardware/linux_data.py
View file

@ -495,9 +495,9 @@ CPU_INFO_TEST_SCENARIOS = [
'7', 'POWER7 (architected), altivec supported'
],
'processor_cores': 1,
'processor_count': 16,
'processor_count': 8,
'processor_threads_per_core': 1,
'processor_vcpus': 16
'processor_vcpus': 8
},
},
{
@ -531,9 +531,9 @@ CPU_INFO_TEST_SCENARIOS = [
'23', 'POWER8 (architected), altivec supported',
],
'processor_cores': 1,
'processor_count': 48,
'processor_count': 24,
'processor_threads_per_core': 1,
'processor_vcpus': 48
'processor_vcpus': 24
},
},
{

4
test/units/module_utils/facts/hardware/test_linux_get_cpu_info.py
View file

@ -26,13 +26,13 @@ def test_get_cpu_info_missing_arch(mocker):
module = mocker.Mock()
inst = linux.LinuxHardware(module)
# ARM will report incorrect processor count if architecture is not available
# ARM and Power will report incorrect processor count if architecture is not available
mocker.patch('os.path.exists', return_value=False)
mocker.patch('os.access', return_value=True)
for test in CPU_INFO_TEST_SCENARIOS:
mocker.patch('ansible.module_utils.facts.hardware.linux.get_file_lines', side_effect=[[], test['cpuinfo']])
test_result = inst.get_cpu_facts()
if test['architecture'].startswith(('armv', 'aarch')):
if test['architecture'].startswith(('armv', 'aarch', 'ppc')):
assert test['expected_result'] != test_result
else:
assert test['expected_result'] == test_result