Merge pull request #4657 from mxpv/master

AkihiroSuda · web-flow · commit f51d5f773d0c · 2020-10-27T02:03:38.000+09:00
Fix panic in shim not logged
diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go
@@ -90,5 +90,5 @@ func handleSignals(ctx context.Context, logger *logrus.Entry, signals chan os.Si
 }
 
 func openLog(ctx context.Context, _ string) (io.Writer, error) {
-	return fifo.OpenFifo(ctx, "log", unix.O_WRONLY, 0700)
+	return fifo.OpenFifoDup2(ctx, "log", unix.O_WRONLY, 0700, int(os.Stderr.Fd()))
 }
diff --git a/vendor.conf b/vendor.conf
@@ -5,7 +5,7 @@ github.com/containerd/btrfs                         153935315f4ab9be5bf03650a134
 github.com/containerd/cgroups                       0b889c03f102012f1d93a97ddd3ef71cd6f4f510
 github.com/containerd/console                       v1.0.1
 github.com/containerd/continuity                    efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
-github.com/containerd/fifo                          f15a3290365b9d2627d189e619ab4008e0069caf
+github.com/containerd/fifo                          cc76b10a4c47cdfac4bf6c373cc643628a72bfe9
 github.com/containerd/go-runc                       7016d3ce2328dd2cb1192b2076ebd565c4e8df0c
 github.com/containerd/nri                           eb1350a75164f76de48e3605389e7a3fbc85d06e
 github.com/containerd/ttrpc                         v1.0.2
diff --git a/vendor/github.com/containerd/fifo/fifo.go b/vendor/github.com/containerd/fifo/fifo.go

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,5 @@ func handleSignals(ctx context.Context, logger *logrus.Entry, signals chan os.Si`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func openLog(ctx context.Context, _ string) (io.Writer, error) {`
`93`		`- return fifo.OpenFifo(ctx, "log", unix.O_WRONLY, 0700)`
	`93`	`+ return fifo.OpenFifoDup2(ctx, "log", unix.O_WRONLY, 0700, int(os.Stderr.Fd()))`
`94`	`94`	`}`