opencontainers/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-07-30 17:43:06 +03:00
Code Activity

restore: fix a race condition in process.Wait()

Browse Source 
Adrian reported that the checkpoint test stated failing:
=== RUN   TestCheckpoint
--- FAIL: TestCheckpoint (0.38s)
    checkpoint_test.go:297: Did not restore the pipe correctly:

The problem here is when we start exec.Cmd, we don't call its wait
method. This means that we don't wait cmd.goroutines ans so we don't
know when all data will be read from process pipes.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin
2020-02-09 22:32:56 -08:00
parent e6555cc01a
commit 269ea385a4
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainer/integration/checkpoint_test.go
View File

@ -42,7 +42,6 @@ func showFile(t *testing.T, fname string) error {
}
func TestUsernsCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
t.Skip("userns is unsupported")
}
@ -54,7 +53,6 @@ func TestUsernsCheckpoint(t *testing.T) {
}
func TestCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
testCheckpoint(t, false)
}
@ -248,7 +246,7 @@ func testCheckpoint(t *testing.T, userns bool) {
}
restoreStdinW.Close()
s, err := process.Wait()
s, err := restoreProcessConfig.Wait()
if err != nil {
t.Fatal(err)
}