Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

numa: replace parse_numa_nodeset_to_str() to convert_all_nodes_to_string() #5616

Merged
merged 1 commit into from
May 17, 2024
Merged

numa: replace parse_numa_nodeset_to_str() to convert_all_nodes_to_string() #5616

merged 1 commit into from
May 17, 2024

Conversation

QianJianhua1
Copy link
Contributor

@QianJianhua1 QianJianhua1 commented May 15, 2024 •
edited
Loading

In PR avocado-framework/avocado-vt#3804, a similar bug is fixed by replacing parse_numa_nodeset_to_str with the new convert_all_nodes_to_string function. However, parse_numa_nodeset_to_str is still called at several places. Therefore, in this PR, replace all parse_numa_nodeset_to_str to convert_all_nodes_to_string.

Signed-off-by: Qian Jianhua [email protected]

Before:

 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_interleave.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.25 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_interleave.vcpu_static: FAIL: Expect cpuset.mems=0-1, but found 0-3 (52.61 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_preferred.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.94 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_preferred.vcpu_static: FAIL: Expect cpuset.mems=0-1, but found 0-3 (52.94 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_undefined.mem_mode_none.vcpu_static: \^[[FAIL: Expect cpuset.mems=0-1, but found 0-3 (52.91 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_undefined.mem_mode_interleave.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.39 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_undefined.mem_mode_preferred.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.47 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_interleave.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.66 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_interleave.vcpu_static: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.05 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_preferred.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.69 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_preferred.vcpu_static: FAIL: Expect cpuset.mems=0-1, but found 0-3 (52.10 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_undefined.mem_mode_none.vcpu_static: FAIL: Expect cpuset.mems=0-1, but found 0-3 (52.50 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_undefined.mem_mode_interleave.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.37 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_undefined.mem_mode_preferred.vcpu_auto: FAIL: Expect cpuset.mems=0-1, but found 0-3 (53.60 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.default_pagesize.mem_mode_interleave.single_host_node: FAIL: Expect cpuset.mems in path '/sys/fs/cgroup/cpuset/machine.slice/machine-qemu\x2d1\x2davocado\x2dvt\x2dvm1.scope/libvirt/emulator/cpuset.mems' to be 0-1, but found '0-3' (53.02 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.default_pagesize.mem_mode_preferred.single_host_node: FAIL: Expect cpuset.mems in path '/sys/fs/cgroup/cpuset/machine.slice/machine-qemu\x2d1\x2davocado\x2dvt\x2dvm1.scope/libvirt/emulator/cpuset.mems' to be 0-1, but found '0-3' (51.54 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.hugepage.mem_mode_interleave.single_host_node: FAIL: Expect cpuset.mems in path '/sys/fs/cgroup/cpuset/machine.slice/machine-qemu\x2d1\x2davocado\x2dvt\x2dvm1.scope/libvirt/emulator/cpuset.mems' to be 0-1, but found '0-3' (55.88 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.hugepage.mem_mode_interleave.multiple_host_nodes: FAIL: Expect cpuset.mems in path '/sys/fs/cgroup/cpuset/machine.slice/machine-qemu\x2d1\x2davocado\x2dvt\x2dvm1.scope/libvirt/emulator/cpuset.mems' to be 0-1, but found '0-3' (51.44 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.hugepage.mem_mode_preferred.single_host_node: FAIL: Expect cpuset.mems in path '/sys/fs/cgroup/cpuset/machine.slice/machine-qemu\x2d1\x2davocado\x2dvt\x2dvm1.scope/libvirt/emulator/cpuset.mems' to be 0-1, but found '0-3' (51.97 s)

After:

 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_interleave.vcpu_auto: PASS (48.93 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_interleave.vcpu_static: PASS (46.90 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_preferred.vcpu_auto: PASS (48.31 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_defined.mem_mode_preferred.vcpu_static: PASS (46.35 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_undefined.mem_mode_none.vcpu_static: PASS (46.61 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_undefined.mem_mode_interleave.vcpu_auto: PASS (48.48 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.without_iothread.nodeset_undefined.mem_mode_preferred.vcpu_auto: PASS (48.23 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_interleave.vcpu_auto: PASS (49.11 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_interleave.vcpu_static: PASS (47.16 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_preferred.vcpu_auto: PASS (49.38 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_defined.mem_mode_preferred.vcpu_static: PASS (47.41 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_undefined.mem_mode_none.vcpu_static: PASS (47.42 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_undefined.mem_mode_interleave.vcpu_auto: PASS (49.02 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.auto_memory_nodeset_placement.with_iothread.nodeset_undefined.mem_mode_preferred.vcpu_auto: PASS (48.93 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.default_pagesize.mem_mode_interleave.single_host_node: PASS (51.73 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.default_pagesize.mem_mode_preferred.single_host_node: PASS (51.72 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.hugepage.mem_mode_interleave.single_host_node: PASS (50.14 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.hugepage.mem_mode_interleave.multiple_host_nodes: PASS (50.11 s)
 (1/1) type_specific.io-github-autotest-libvirt.guest_numa_node_tuning.memory_binding_setting.hugepage.mem_mode_preferred.single_host_node: PASS (49.95 s)

@QianJianhua1 QianJianhua1 mentioned this pull request May 15, 2024
Merged
@Yingshun Yingshun added the depend on The PR has dependency on other PRs label May 15, 2024
@Yingshun Yingshun requested a review from dzhengfy May 15, 2024 10:30
dzhengfy
dzhengfy approved these changes May 17, 2024
View reviewed changes
Copy link
Contributor

@dzhengfy dzhengfy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for your fixing

@dzhengfy dzhengfy merged commit 1571a87 into autotest:master May 17, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dzhengfy dzhengfy dzhengfy approved these changes

Assignees
No one assigned
Labels
depend on The PR has dependency on other PRs minorfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@QianJianhua1 @dzhengfy @Yingshun