Merge pull request kubernetes#92779 from fisherxu/patch-2

k8s-ci-robot · web-flow · commit a6378d8b1213 · 2020-07-10T15:41:37.000-07:00
Return err when create ContainerLogsDir failed
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
@@ -1247,7 +1247,7 @@ func (kl *Kubelet) initializeModules() error {
 	// If the container logs directory does not exist, create it.
 	if _, err := os.Stat(ContainerLogsDir); err != nil {
 		if err := kl.os.MkdirAll(ContainerLogsDir, 0755); err != nil {
-			klog.Errorf("Failed to create directory %q: %v", ContainerLogsDir, err)
+			return fmt.Errorf("failed to create directory %q: %v", ContainerLogsDir, err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1247,7 +1247,7 @@ func (kl *Kubelet) initializeModules() error {`
`1247`	`1247`	`// If the container logs directory does not exist, create it.`
`1248`	`1248`	`if _, err := os.Stat(ContainerLogsDir); err != nil {`
`1249`	`1249`	`if err := kl.os.MkdirAll(ContainerLogsDir, 0755); err != nil {`
`1250`		`- klog.Errorf("Failed to create directory %q: %v", ContainerLogsDir, err)`
	`1250`	`+ return fmt.Errorf("failed to create directory %q: %v", ContainerLogsDir, err)`
`1251`	`1251`	`}`
`1252`	`1252`	`}`
`1253`	`1253`