Fix fd leak of shim log

darfux · fuweid · commit 5cd83f397f16 · 2019-05-10T22:59:30.000+08:00
Open shim v2 log with the flag `O_RDWR` will cause the `Read()` block forever even if the pipe has been closed on the shim side. Then the `io.Copy()` would never return and lead to a fd leak. Fix typo when closing shim v1 log which causes the `stdouLog` leak. Update `numPipes` function in test case to get the opened FIFO correctly. Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com> (cherry picked from commit cf6e008) Signed-off-by: Wei Fu <fuweid89@gmail.com>
diff --git a/container_linux_test.go b/container_linux_test.go
@@ -329,7 +329,7 @@ func TestShimDoesNotLeakPipes(t *testing.T) {
 }
 
 func numPipes(pid int) (int, error) {
-	cmd := exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d | grep pipe", pid))
+	cmd := exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d | grep FIFO", pid))
 
 	var stdout bytes.Buffer
 	cmd.Stdout = &stdout
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
@@ -96,9 +96,9 @@ func WithStart(binary, address, daemonAddress, cgroup string, debug bool, exitHa
 			cmd.Wait()
 			exitHandler()
 			if stdoutLog != nil {
-				stderrLog.Close()
+				stdoutLog.Close()
 			}
-			if stdoutLog != nil {
+			if stderrLog != nil {
 				stderrLog.Close()
 			}
 		}()
diff --git a/runtime/v2/shim_unix.go b/runtime/v2/shim_unix.go
@@ -28,5 +28,5 @@ import (
 )
 
 func openShimLog(ctx context.Context, bundle *Bundle) (io.ReadCloser, error) {
-	return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDWR|unix.O_CREAT, 0700)
+	return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDONLY|unix.O_CREAT|unix.O_NONBLOCK, 0700)
 }

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func TestShimDoesNotLeakPipes(t *testing.T) {`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`func numPipes(pid int) (int, error) {`
`332`		`- cmd := exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d \| grep pipe", pid))`
	`332`	`+ cmd := exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d \| grep FIFO", pid))`
`333`	`333`
`334`	`334`	`var stdout bytes.Buffer`
`335`	`335`	`cmd.Stdout = &stdout`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,9 @@ func WithStart(binary, address, daemonAddress, cgroup string, debug bool, exitHa`
`96`	`96`	`cmd.Wait()`
`97`	`97`	`exitHandler()`
`98`	`98`	`if stdoutLog != nil {`
`99`		`- stderrLog.Close()`
	`99`	`+ stdoutLog.Close()`
`100`	`100`	`}`
`101`		`- if stdoutLog != nil {`
	`101`	`+ if stderrLog != nil {`
`102`	`102`	`stderrLog.Close()`
`103`	`103`	`}`
`104`	`104`	`}()`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ import (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`func openShimLog(ctx context.Context, bundle *Bundle) (io.ReadCloser, error) {`
`31`		`- return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDWR\|unix.O_CREAT, 0700)`
	`31`	`+ return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDONLY\|unix.O_CREAT\|unix.O_NONBLOCK, 0700)`
`32`	`32`	`}`