Skip to content

facts - return the correct number of VCPUs for systems with only one core#74693

Open
samdoran wants to merge 14 commits intoansible:develfrom
samdoran:cpu-count-same-id
Open

facts - return the correct number of VCPUs for systems with only one core#74693
samdoran wants to merge 14 commits intoansible:develfrom
samdoran:cpu-count-same-id

Conversation

@samdoran
Copy link
Contributor

@samdoran samdoran commented May 13, 2021 •
edited
Loading

SUMMARY

If the physical id and core id are all the same, the CPU information is incorrectly calculated. Instead, count the number of CPU IDs to get an accurate count.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

lib/ansible/module_utils/facts/hardware/linux.py

@ansibot ansibot added affects_2.12 core_review In order to be merged, this PR must follow the core review workflow. needs_triage Needs a first human triage before being processed. support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels May 13, 2021
@samdoran samdoran removed the needs_triage Needs a first human triage before being processed. label May 18, 2021
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels May 27, 2021
@ansibot ansibot added stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. and removed stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. labels Jun 7, 2021
@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Jun 18, 2021
@samdoran
Copy link
Contributor Author

samdoran commented Jul 19, 2021

/rebuild

@ansibot ansibot removed the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Jul 19, 2021
@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Jul 27, 2021
@ansibot ansibot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Mar 2, 2022
@s-hertel
Copy link
Contributor

s-hertel commented Aug 3, 2022

@samdoran Can you rebase this one too?

samdoran added 7 commits August 3, 2022 13:33
@samdoran
IDs should be ints not strings
77f5793
@samdoran
Rename fixture files to reflect number of cores
01420e6
@samdoran
Add new test fixture and reorganize existing fixtures
0e14681
@samdoran
Use processor_occurence when "core id" and "physical id" are all the …
bb06541 
…same
@samdoran
Use parametrize in unit test
3f6fbd6 
This makes it much easier to run specific test fixtures.
@samdoran
Simplify processor tabulation
a5e8f4c 
Created a dictitonary of sockets used to track and later derive all CPU based facts. This makes
the final reporting much simpler since all the data about CPUs is contained in one dict and the
dict is a map of the socket to CPU relationships.
@samdoran
Update tests
088406a 
I believe these values were incorrect before since they were calculated rather than taken from
the /proc/cpuinfo. I need to double check and make sure these new values are correct or if
there is a bug in my code.
@samdoran
Copy link
Contributor Author

samdoran commented Aug 3, 2022

I'm only here for the rebases. 🤪

@samdoran samdoran force-pushed the cpu-count-same-id branch from 324401b to 58b073c Compare August 3, 2022 17:40
@ansibot ansibot added needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI. core_review In order to be merged, this PR must follow the core review workflow. and removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Aug 3, 2022
@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Aug 11, 2022
@ansibot ansibot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Feb 28, 2023
@ansibot ansibot added test This PR relates to tests. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jul 12, 2023
@ansibot ansibot removed the needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html label Sep 7, 2023
@ansibot ansibot added the needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html label Sep 14, 2023
@ansibot ansibot removed the needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html label Sep 21, 2023
@ansibot ansibot added the needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html label Oct 5, 2023
@ansibot ansibot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html and removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html labels Oct 19, 2023
@Akasurde
Copy link
Member

Akasurde commented May 9, 2024

@samdoran Could you please rebase this? Thanks in advance.

@samdoran
Copy link
Contributor Author

samdoran commented May 9, 2024

I'm working on it. Might take me a little while though since there are some conflicts to work through.

@Akasurde
Copy link
Member

Akasurde commented May 9, 2024

I'm working on it. Might take me a little while though since there are some conflicts to work through.

Sure, let me know if you need help. Thanks,

@ansibot ansibot added the stale_pr This PR has not been pushed to for more than one year. label Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

affects_2.12 core_review In order to be merged, this PR must follow the core review workflow. needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. stale_pr This PR has not been pushed to for more than one year. support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@samdoran @s-hertel @Akasurde @ansibot