Skip to content

Commit

Permalink
zdtm: make cgroup testcases run non-parallel
Browse files Browse the repository at this point in the history
cgroup testcases live in the same cgroup root zdtmtst and
zdtmtst.defaultroot controller then create child subgroup for testing. This
can cause problems when cgroup testcases are run in parallel. For example,
testcase A dumps the child subgroup of testcase B since it's in the cgroup
root but in the middle of restoring of testcase A, testcase B completes and
cleans up the subgroup directory. This causes error in testcase A restore.
This commit adds excl flag to all cgroup testcases description so that
these don't run parallel.

Signed-off-by: Bui Quang Minh <[email protected]>
  • Loading branch information
minhbq-99 committed Jul 12, 2024
1 parent 6f92787 commit b4dcfa7
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroup00.desc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
{'flavor': 'h', 'flags': 'suid excl', 'opts': '--manage-cgroups'}
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroup01.desc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
{'flavor': 'h', 'flags': 'suid excl', 'opts': '--manage-cgroups'}
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroup02.desc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ 'dopts': '--manage-cgroups --cgroup-root name=zdtmtst:/prefix',
'flags': 'suid',
'flags': 'suid excl',
'flavor': 'h',
'ropts': '--manage-cgroups --cgroup-root /newroot --cgroup-root name=zdtmtst:/prefix'}
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroup_threads.desc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
{'flavor': 'h', 'flags': 'suid excl', 'opts': '--manage-cgroups'}
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroup_yard.desc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'flavor': 'h',
'flags': 'suid',
'flags': 'suid excl',
# We create the external cgroup yard in working directory during --pre-dump
# hook. We have to go up a few directories to find the yard.
'opts': '--manage-cgroups --cgroup-yard ../../../../../../external_yard'
Expand Down
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroupns.desc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ 'feature': 'cgroupns',
'flags': 'suid',
'flags': 'suid excl',
'flavor': 'h',
'opts': '--manage-cgroups'}
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroupv2_00.desc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{'flavor': 'h ns', 'flags': 'suid', 'opts': '--manage-cgroups=full'}
{'flavor': 'h ns', 'flags': 'suid excl', 'opts': '--manage-cgroups=full'}
2 changes: 1 addition & 1 deletion test/zdtm/static/cgroupv2_01.desc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{'flavor': 'h ns', 'flags': 'suid', 'opts': '--manage-cgroups=full'}
{'flavor': 'h ns', 'flags': 'suid excl', 'opts': '--manage-cgroups=full'}

0 comments on commit b4dcfa7

Please sign in to comment.