Merge pull request #1618 from zhsj/bpo-containerd-4863

AkihiroSuda · web-flow · commit ed743f7fd0a3 · 2021-02-10T17:53:17.000+09:00
[release/1.4] Ensure log dir is created
diff --git a/pkg/server/helpers_unix.go b/pkg/server/helpers_unix.go
@@ -151,6 +151,9 @@ func (c *criService) seccompEnabled() bool {
 
 // openLogFile opens/creates a container log file.
 func openLogFile(path string) (*os.File, error) {
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		return nil, err
+	}
 	return os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0640)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,9 @@ func (c *criService) seccompEnabled() bool {`
`151`	`151`
`152`	`152`	`// openLogFile opens/creates a container log file.`
`153`	`153`	`func openLogFile(path string) (*os.File, error) {`
	`154`	`+ if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {`
	`155`	`+ return nil, err`
	`156`	`+ }`
`154`	`157`	`return os.OpenFile(path, os.O_CREATE\|os.O_APPEND\|os.O_WRONLY, 0640)`
`155`	`158`	`}`
`156`	`159`