Commit 73fc3a77 authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

zdtm/cgroup01: create more than one empty cgroups

We found a bug, when a second cgroup is restored incorrectly,
so let's create one more empty cgroup.
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent bbdff348
...@@ -9,7 +9,8 @@ echo "Cleaning $tname" ...@@ -9,7 +9,8 @@ echo "Cleaning $tname"
set +e set +e
rmdir "$tname/subcg/subsubcg/" rmdir "$tname/subcg/subsubcg/"
rmdir "$tname/subcg/empty/" rmdir "$tname/subcg/empty.0/"
rmdir "$tname/subcg/empty.1/"
rmdir "$tname/subcg/" rmdir "$tname/subcg/"
set -e set -e
......
...@@ -17,7 +17,7 @@ static const char *empty = "empty"; ...@@ -17,7 +17,7 @@ static const char *empty = "empty";
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int cgfd, l, ret = 1; int cgfd, l, ret = 1, i;
char aux[1024], paux[1024]; char aux[1024], paux[1024];
FILE *cgf; FILE *cgf;
struct stat st; struct stat st;
...@@ -55,8 +55,13 @@ int main(int argc, char **argv) ...@@ -55,8 +55,13 @@ int main(int argc, char **argv)
goto out_rs; goto out_rs;
} }
sprintf(paux, "%s/%s/%s", dirname, subname, empty); for (i = 0; i < 2; i++) {
mkdir(paux, 0600); sprintf(paux, "%s/%s/%s.%d", dirname, subname, empty, i);
if (mkdir(paux, 0600)) {
err("mkdir %s", paux);
return 1;
}
}
test_daemon(); test_daemon();
test_waitsig(); test_waitsig();
...@@ -71,10 +76,14 @@ int main(int argc, char **argv) ...@@ -71,10 +76,14 @@ int main(int argc, char **argv)
char *s; char *s;
s = strstr(paux, cgname); s = strstr(paux, cgname);
if (s) { if (!s)
sscanf(paux, "%*d %*d %*d:%*d %*s %s", aux); continue;
test_msg("found cgroup at %s\n", aux);
sprintf(paux, "%s/%s/%s", aux, subname, empty); sscanf(paux, "%*d %*d %*d:%*d %*s %s", aux);
test_msg("found cgroup at %s\n", aux);
for (i = 0; i < 2; i++) {
sprintf(paux, "%s/%s/%s.%d", aux, subname, empty, i);
if (stat(paux, &st)) { if (stat(paux, &st)) {
fail("couldn't stat %s\n", paux); fail("couldn't stat %s\n", paux);
ret = -1; ret = -1;
...@@ -86,11 +95,11 @@ int main(int argc, char **argv) ...@@ -86,11 +95,11 @@ int main(int argc, char **argv)
ret = -1; ret = -1;
goto out_close; goto out_close;
} }
pass();
ret = 0;
goto out_close;
} }
pass();
ret = 0;
goto out_close;
} }
fail("empty cgroup not found!\n"); fail("empty cgroup not found!\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment