[cri] ensure log dir is created

crosbymichael · crosbymichael · commit 2e442ea4852d · 2020-12-17T15:04:39.000-05: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 &lt;michael@thepasture.io&gt;
diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go
@@ -156,6 +156,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
`@@ -156,6 +156,9 @@ func (c *criService) seccompEnabled() bool {`
`156`	`156`
`157`	`157`	`// openLogFile opens/creates a container log file.`
`158`	`158`	`func openLogFile(path string) (*os.File, error) {`
	`159`	`+ if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {`
	`160`	`+ return nil, err`
	`161`	`+ }`
`159`	`162`	`return os.OpenFile(path, os.O_CREATE\|os.O_APPEND\|os.O_WRONLY, 0640)`
`160`	`163`	`}`
`161`	`164`