change flag from RDONLY to RDWR and close the fifo correct

payall4u · payall4u · commit edffc830bb21 · 2021-02-01T22:56:12.000+08:00
Signed-off-by: Zhiyu Li <payall4u@qq.com> (cherry picked from commit 957fa33)
diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go
@@ -115,6 +115,7 @@ func (b *binary) Start(ctx context.Context, opts *types.Any, onClose func()) (_
 	onCloseWithShimLog := func() {
 		onClose()
 		cancelShimLog()
+		f.Close()
 	}
 	client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onCloseWithShimLog))
 	return &shim{
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -76,7 +76,13 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 			conn.Close()
 		}
 	}()
-	f, err := openShimLog(ctx, bundle, client.AnonReconnectDialer)
+	shimCtx, cancelShimLog := context.WithCancel(ctx)
+	defer func() {
+		if err != nil {
+			cancelShimLog()
+		}
+	}()
+	f, err := openShimLog(shimCtx, bundle, client.AnonReconnectDialer)
 	if err != nil {
 		return nil, errors.Wrap(err, "open shim log pipe")
 	}
@@ -99,8 +105,12 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 			}
 		}
 	}()
-
-	client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onClose))
+	onCloseWithShimLog := func() {
+		onClose()
+		cancelShimLog()
+		f.Close()
+	}
+	client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onCloseWithShimLog))
 	defer func() {
 		if err != nil {
 			client.Close()
diff --git a/runtime/v2/shim_unix.go b/runtime/v2/shim_unix.go
@@ -30,7 +30,7 @@ import (
 )
 
 func openShimLog(ctx context.Context, bundle *Bundle, _ func(string, time.Duration) (net.Conn, error)) (io.ReadCloser, error) {
-	return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDONLY|unix.O_CREAT|unix.O_NONBLOCK, 0700)
+	return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDWR|unix.O_CREAT|unix.O_NONBLOCK, 0700)
 }
 
 func checkCopyShimLogError(ctx context.Context, err error) error {

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ func (b binary) Start(ctx context.Context, opts types.Any, onClose func()) (_`
`115`	`115`	`onCloseWithShimLog := func() {`
`116`	`116`	`onClose()`
`117`	`117`	`cancelShimLog()`
	`118`	`+ f.Close()`
`118`	`119`	`}`
`119`	`120`	`client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onCloseWithShimLog))`
`120`	`121`	`return &shim{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func openShimLog(ctx context.Context, bundle *Bundle, _ func(string, time.Duration) (net.Conn, error)) (io.ReadCloser, error) {`
`33`		`- return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDONLY\|unix.O_CREAT\|unix.O_NONBLOCK, 0700)`
	`33`	`+ return fifo.OpenFifo(ctx, filepath.Join(bundle.Path, "log"), unix.O_RDWR\|unix.O_CREAT\|unix.O_NONBLOCK, 0700)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func checkCopyShimLogError(ctx context.Context, err error) error {`