Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/hugemmap-timeout into ~canonical-kernel-team/+git/autotest-client-tests:master

Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: e15c7b927066732c08ac59405e6cd1092983735f
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/hugemmap-timeout
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 14 lines (+2/-1)
1 file modified
ubuntu_ltp_stable/ubuntu_ltp_stable.py (+2/-1)
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+466908@code.launchpad.net

Commit message

BugLink: https://bugs.launchpad.net/bugs/2068006

Issue found on ARM64 node appleton-kernel.
hugemmap06 test took 48 seconds to run with N-generic-64k 6.8.0-35.35
hugemmap15 test took 518 seconds to run with J-generic-64k 5.15.0-112.122

Bump the timeout multiplier to 5x and 25x respectively. So that it will
be 150 seconds and 750 seconds.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

+1

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed, thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_ltp_stable/ubuntu_ltp_stable.py b/ubuntu_ltp_stable/ubuntu_ltp_stable.py
2index 9c9502b..ed7ddd9 100644
3--- a/ubuntu_ltp_stable/ubuntu_ltp_stable.py
4+++ b/ubuntu_ltp_stable/ubuntu_ltp_stable.py
5@@ -108,7 +108,8 @@ class ubuntu_ltp_stable(test.test):
6 'ioctl_sg01': '3', # cve-2018-1000204 / ioctl_sg01 (LP: #1899413, LP: #1936886, LP: #1949934)
7 'in6_02': '4',
8 'hugefork02': '5', # LP: #2026543
9- 'hugemmap15': '10'} # LP: #2026248
10+ 'hugemmap06': '5', # LP: #2068006
11+ 'hugemmap15': '25'} # LP: #2026248, LP: #2068006
12 if utils.system_output('virt-what', verbose=False):
13 print("Running in VM, set timeout multiplier LTP_TIMEOUT_MUL=3 for memcg_test_3 (lp:1836694)")
14 timeout_cases['memcg_test_3'] = '3'

Subscribers

People subscribed via source and target branches

to all changes: