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

guest_resoure_control: Fix regexp for getting first nvme disk #5045

Merged
merged 1 commit into from
Jul 25, 2023
Merged

guest_resoure_control: Fix regexp for getting first nvme disk #5045

merged 1 commit into from
Jul 25, 2023

Conversation

hs0210
Copy link
Contributor

@hs0210 hs0210 commented Jul 21, 2023

The current regexp can not used for getting nvme disk, so update the regexp.

avocado-framework/avocado-vt#3724 fix the behaviour in guest.

Before:

ERROR| ERROR 1-type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.positive -> CmdError: Command 'cat /sys/block//queue/scheduler' failed.
stdout: b''
stderr: b'cat: /sys/block//queue/scheduler: No such file or directory\n'
additional_info: None

After:

INFO | PASS 1-type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.positive

@hs0210
guest_resoure_control: Fix regexp for getting first nvme disk
2d8c88e 
The current regexp can not used for getting nvme disk,
so update the regexp.

Signed-off-by: Hu Shuai <[email protected]>
@hs0210
Copy link
Contributor Author

hs0210 commented Jul 21, 2023

The entire guest_resource_control.control_cgroup test cases passes on a machine with only nvme disk.

# /usr/local/bin/avocado run --vt-type libvirt --test-runner=runner --vt-machine-type arm64-mmio guest_resource_control.control_cgroup --vt-connect-uri qemu:///system                                                                                                                     
JOB ID     : 828f544192733510e3f6c9f90d65ae1512a94854
JOB LOG    : /var/lib/avocado/job-results/job-2023-07-21T01.39-828f544/job.log
 (001/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.positive: PASS (5.41 s)
 (002/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.negative.value_over_limit: PASS (5.70 s)
 (003/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.negative.value_negative: PASS (5.69 s)
 (004/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.negative.value_not_int: PASS (5.48 s)
 (005/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.weight.negative.value_not_number: PASS (5.53 s)
 (006/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.device_weight.positive: PASS (5.55 s)
 (007/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_running.hot.blkiotune.device_weight.negative.value_not_number: PASS (5.56 s)
......
 (179/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_shutdown.config.schedinfo.global_quota.negative.value_not_number: PASS (4.54 s)                                                                                                                                                 
 (180/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_shutdown.config.schedinfo.iothread_period.positive: PASS (25.22 s)
 (181/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_shutdown.config.schedinfo.iothread_period.negative.value_not_number: PASS (4.38 s)                                                                                                                                              
 (182/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_shutdown.config.schedinfo.iothread_quota.positive.value_positive: PASS (26.22 s)                                                                                                                                                
 (183/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_shutdown.config.schedinfo.iothread_quota.positive.value_negative: PASS (25.23 s)                                                                                                                                                
 (184/184) type_specific.io-github-autotest-libvirt.guest_resource_control.control_cgroup.vm_shutdown.config.schedinfo.iothread_quota.negative.value_not_number: PASS (4.40 s)                                                                                                                                               
RESULTS    : PASS 184 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB HTML   : /var/lib/avocado/job-results/job-2023-07-21T01.39-828f544/results.html
JOB TIME   : 1487.79 s

chunfuwen
chunfuwen approved these changes Jul 25, 2023
View reviewed changes
Copy link
Contributor

@chunfuwen chunfuwen left a comment

Choose a reason for hiding this comment

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

lgtm

@hs0210 hs0210 mentioned this pull request Jul 25, 2023
Merged
dzhengfy
dzhengfy approved these changes Jul 25, 2023
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

@dzhengfy dzhengfy merged commit d65360b into autotest:master Jul 25, 2023
4 checks passed
@hs0210 hs0210 deleted the guest_resoure_control branch September 14, 2023 03:49
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

@chunfuwen chunfuwen chunfuwen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hs0210 @dzhengfy @chunfuwen