diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 80209b02684..37c9d8a1e2a 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -100,7 +100,7 @@ const ( nodeStatusUpdateRetry = 5 // Location of container logs. - containerLogsDir = "/var/log/containers" + ContainerLogsDir = "/var/log/containers" // max backoff period, exported for the e2e test MaxContainerBackOff = 300 * time.Second @@ -619,7 +619,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub kubeCfg.PodInfraContainerImage, float32(kubeCfg.RegistryPullQPS), int(kubeCfg.RegistryBurst), - containerLogsDir, + ContainerLogsDir, kubeDeps.OSInterface, klet.networkPlugin, klet, @@ -1149,9 +1149,9 @@ func (kl *Kubelet) initializeModules() error { } // Step 3: 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 { - glog.Errorf("Failed to create directory %q: %v", containerLogsDir, err) + if _, err := os.Stat(ContainerLogsDir); err != nil { + if err := kl.os.MkdirAll(ContainerLogsDir, 0755); err != nil { + glog.Errorf("Failed to create directory %q: %v", ContainerLogsDir, err) } } diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go index 24ffc59834c..9ad3c476af3 100644 --- a/pkg/kubelet/runonce.go +++ b/pkg/kubelet/runonce.go @@ -48,9 +48,9 @@ func (kl *Kubelet) RunOnce(updates <-chan kubetypes.PodUpdate) ([]RunPodResult, } // 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 { - glog.Errorf("Failed to create directory %q: %v", containerLogsDir, err) + if _, err := os.Stat(ContainerLogsDir); err != nil { + if err := kl.os.MkdirAll(ContainerLogsDir, 0755); err != nil { + glog.Errorf("Failed to create directory %q: %v", ContainerLogsDir, err) } } diff --git a/test/e2e_node/log_path_test.go b/test/e2e_node/log_path_test.go new file mode 100644 index 00000000000..b14bbd7eb7c --- /dev/null +++ b/test/e2e_node/log_path_test.go @@ -0,0 +1,120 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package e2e_node + +import ( + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/util/uuid" + "k8s.io/kubernetes/test/e2e/framework" + + . "github.com/onsi/ginkgo" +) + +const logString = "This is the expected log content of this node e2e test" + +var _ = framework.KubeDescribe("ContainerLogPath", func() { + f := framework.NewDefaultFramework("kubelet-container-log-path") + Describe("Pod with a container", func() { + Context("printed log to stdout", func() { + It("should print log to correct log path", func() { + podClient := f.PodClient() + ns := f.Namespace.Name + + rootfsDirVolumeName := "docker-dir-vol" + + rootfsDir := "/root" + rootDir := "/" + logDir := kubelet.ContainerLogsDir + + logPodName := "logger-" + string(uuid.NewUUID()) + logContName := "logger-c-" + string(uuid.NewUUID()) + checkPodName := "checker" + string(uuid.NewUUID()) + checkContName := "checker-c-" + string(uuid.NewUUID()) + + logPod := &api.Pod{ + ObjectMeta: api.ObjectMeta{ + Name: logPodName, + }, + Spec: api.PodSpec{ + // this pod is expected to exit successfully + RestartPolicy: api.RestartPolicyNever, + Containers: []api.Container{ + { + Image: "gcr.io/google_containers/busybox:1.24", + Name: logContName, + Command: []string{"sh", "-c", "echo " + logString}, + }, + }, + }, + } + + podClient.Create(logPod) + err := framework.WaitForPodSuccessInNamespace(f.Client, logPodName, ns) + framework.ExpectNoError(err, "Failed waiting for pod: %s to enter success state", logPodName) + + // get containerID from created Pod + createdLogPod, err := podClient.Get(logPodName) + logConID := kubecontainer.ParseContainerID(createdLogPod.Status.ContainerStatuses[0].ContainerID) + framework.ExpectNoError(err, "Failed to get pod: %s", logPodName) + + expectedlogFile := logDir + "/" + logPodName + "_" + ns + "_" + logContName + "-" + logConID.ID + ".log" + + checkPod := &api.Pod{ + ObjectMeta: api.ObjectMeta{ + Name: checkPodName, + }, + Spec: api.PodSpec{ + // this pod is expected to exit successfully + RestartPolicy: api.RestartPolicyNever, + Containers: []api.Container{ + { + Image: "gcr.io/google_containers/busybox:1.24", + Name: checkContName, + // if we find expected log file and contains right content, exit 0 + // else, keep checking until test timeout + Command: []string{"sh", "-c", "chroot " + rootfsDir + " while true; do if [ -e " + expectedlogFile + " ] && grep -q " + logString + " " + expectedlogFile + "; then exit 0; fi; sleep 1; done"}, + VolumeMounts: []api.VolumeMount{ + { + Name: rootfsDirVolumeName, + MountPath: rootfsDir, + ReadOnly: true, + }, + }, + }, + }, + Volumes: []api.Volume{ + { + Name: rootfsDirVolumeName, + VolumeSource: api.VolumeSource{ + HostPath: &api.HostPathVolumeSource{ + Path: rootDir, + }, + }, + }, + }, + }, + } + + podClient.Create(checkPod) + err = framework.WaitForPodSuccessInNamespace(f.Client, checkPodName, ns) + framework.ExpectNoError(err, "Failed waiting for pod: %s to enter success state", checkPodName) + }) + }) + }) +})