github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Support inject delay running with the old version (4.x) of strace for test case.

Browse Source 
Only the newer version of strace can support `--detach-on` options
and set time duration with human readable string.

In the 4.x version of strace, using `-b` to replace `--detach-on`,
and injecting a delay with int usecs.

Signed-off-by: Zoe <hi@zoe.im>
This commit is contained in:
Zoe 2024-02-05 20:43:57 +08:00
parent f5e7fe0cb6
commit a9060cda4a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration/issue7496_linux_test.go
View File

@ -116,11 +116,13 @@ func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.TTR
doneCh := make(chan struct{}) doneCh := make(chan struct{})
// use strace command to mock the delay of umount2
// this require strace version >= 4.22
cmd := exec.CommandContext(ctx, "strace", cmd := exec.CommandContext(ctx, "strace",
"-p", strconv.Itoa(int(pid)), "-f", // attach to all the threads "-p", strconv.Itoa(int(pid)), "-f", // attach to all the threads
"--detach-on=execve", // stop to attach runc child-processes "-b", "execve", // stop to attach runc child-processes
"--trace=umount2", // only trace umount2 syscall "-e", "trace=umount2", // only trace umount2 syscall
"-e", "inject=umount2:delay_enter="+strconv.Itoa(delayInSec)+"s", "-e", "inject=umount2:delay_enter="+strconv.Itoa(delayInSec)+"000000",
) )
cmd.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGKILL} cmd.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGKILL}