Ensure log dir is created

zhsj · zhsj · commit 8b859cbca886 · 2021-02-08T10:56:50.000+08:00
containerd is responsible for creating the log but there is no code to ensure that the log dir exists. While kubelet should have created this there can be times where this is not the case and this can cause stuck tasks. Signed-off-by: Michael Crosby <michael@thepasture.io> (cherry picked from commit containerd/containerd@2e442ea) Signed-off-by: Shengjing Zhu <zhsj@debian.org>
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`