bugfix: makeup logpath from sandbox & container mata

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
AliyunContainerService · Aug 6, 2018 · 0cfa2d0 · 0cfa2d0
1 parent f76d3bc
commit 0cfa2d0
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 2 deletions.
diff --git a/cri/v1alpha1/cri.go b/cri/v1alpha1/cri.go
@@ -714,6 +714,16 @@ func (c *CriManager) ContainerStatus(ctx context.Context, r *runtime.ContainerSt
 		imageRef = imageInfo.RepoDigests[0]
 	}
 
+	podSandboxID := container.Config.Labels[sandboxIDLabelKey]
+	res, err := c.SandboxStore.Get(podSandboxID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get metadata of %q from SandboxStore: %v", podSandboxID, err)
+	}
+	sandboxMeta := res.(*SandboxMeta)
+	logDirectory := sandboxMeta.Config.GetLogDirectory()
+	// TODO: let the container manager handle the log stuff for CRI.
+	logPath := makeupLogPath(logDirectory, metadata)
+
 	status := &runtime.ContainerStatus{
 		Id:          container.ID,
 		Metadata:    metadata,
@@ -729,7 +739,7 @@ func (c *CriManager) ContainerStatus(ctx context.Context, r *runtime.ContainerSt
 		Message:     message,
 		Labels:      labels,
 		Annotations: annotations,
-		// TODO: LogPath.
+		LogPath:     logPath,
 	}
 
 	return &runtime.ContainerStatusResponse{Status: status}, nil

diff --git a/cri/v1alpha1/cri_utils.go b/cri/v1alpha1/cri_utils.go
@@ -449,6 +449,11 @@ func parseContainerName(name string) (*runtime.ContainerMetadata, error) {
 	}, nil
 }
 
+// makeupLogPath makes up the log path of container from log directory and its metadata.
+func makeupLogPath(logDirectory string, metadata *runtime.ContainerMetadata) string {
+	return filepath.Join(logDirectory, fmt.Sprintf("%s_%d.log", metadata.Name, metadata.Attempt))
+}
+
 // modifyContainerNamespaceOptions apply namespace options for container.
 func modifyContainerNamespaceOptions(nsOpts *runtime.NamespaceOption, podSandboxID string, hostConfig *apitypes.HostConfig) {
 	sandboxNSMode := fmt.Sprintf("container:%v", podSandboxID)

diff --git a/cri/v1alpha1/cri_utils_test.go b/cri/v1alpha1/cri_utils_test.go
@@ -573,6 +573,32 @@ func Test_parseContainerName(t *testing.T) {
 	}
 }
 
+func Test_makeupLogPath(t *testing.T) {
+	testCases := []struct {
+		logDirectory  string
+		containerMeta *runtime.ContainerMetadata
+		expected      string
+	}{
+		{
+			logDirectory:  "/var/log/pods/099f1c2b79126109140a1f77e211df00",
+			containerMeta: &runtime.ContainerMetadata{"kube-scheduler", 0},
+			expected:      "/var/log/pods/099f1c2b79126109140a1f77e211df00/kube-scheduler_0.log",
+		},
+		{
+			logDirectory:  "/var/log/pods/d875aada-9920-11e8-bfef-0242ac11001e/",
+			containerMeta: &runtime.ContainerMetadata{"kube-proxy", 10},
+			expected:      "/var/log/pods/d875aada-9920-11e8-bfef-0242ac11001e/kube-proxy_10.log",
+		},
+	}
+
+	for _, test := range testCases {
+		logPath := makeupLogPath(test.logDirectory, test.containerMeta)
+		if !reflect.DeepEqual(test.expected, logPath) {
+			t.Fatalf("unexpected logPath returned by makeupLogPath")
+		}
+	}
+}
+
 func Test_toCriContainerState(t *testing.T) {
 	testCases := []struct {
 		input    apitypes.Status

diff --git a/cri/v1alpha2/cri.go b/cri/v1alpha2/cri.go
@@ -713,6 +713,16 @@ func (c *CriManager) ContainerStatus(ctx context.Context, r *runtime.ContainerSt
 		imageRef = imageInfo.RepoDigests[0]
 	}
 
+	podSandboxID := container.Config.Labels[sandboxIDLabelKey]
+	res, err := c.SandboxStore.Get(podSandboxID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get metadata of %q from SandboxStore: %v", podSandboxID, err)
+	}
+	sandboxMeta := res.(*SandboxMeta)
+	logDirectory := sandboxMeta.Config.GetLogDirectory()
+	// TODO: let the container manager handle the log stuff for CRI.
+	logPath := makeupLogPath(logDirectory, metadata)
+
 	resources := container.HostConfig.Resources
 	diskQuota := container.Config.DiskQuota
 	status := &runtime.ContainerStatus{
@@ -730,7 +740,7 @@ func (c *CriManager) ContainerStatus(ctx context.Context, r *runtime.ContainerSt
 		Message:     message,
 		Labels:      labels,
 		Annotations: annotations,
-		LogPath:     container.LogPath,
+		LogPath:     logPath,
 		Volumes:     parseVolumesFromPouch(container.Config.Volumes),
 		Resources:   parseResourcesFromPouch(resources, diskQuota),
 	}

diff --git a/cri/v1alpha2/cri_utils.go b/cri/v1alpha2/cri_utils.go
@@ -444,6 +444,11 @@ func parseContainerName(name string) (*runtime.ContainerMetadata, error) {
 	}, nil
 }
 
+// makeupLogPath makes up the log path of container from log directory and its metadata.
+func makeupLogPath(logDirectory string, metadata *runtime.ContainerMetadata) string {
+	return filepath.Join(logDirectory, metadata.Name, fmt.Sprintf("%d.log", metadata.Attempt))
+}
+
 // modifyContainerNamespaceOptions apply namespace options for container.
 func modifyContainerNamespaceOptions(nsOpts *runtime.NamespaceOption, podSandboxID string, hostConfig *apitypes.HostConfig) {
 	sandboxNSMode := fmt.Sprintf("container:%v", podSandboxID)

diff --git a/cri/v1alpha2/cri_utils_test.go b/cri/v1alpha2/cri_utils_test.go
@@ -560,6 +560,32 @@ func Test_parseContainerName(t *testing.T) {
 	}
 }
 
+func Test_makeupLogPath(t *testing.T) {
+	testCases := []struct {
+		logDirectory  string
+		containerMeta *runtime.ContainerMetadata
+		expected      string
+	}{
+		{
+			logDirectory:  "/var/log/pods/099f1c2b79126109140a1f77e211df00",
+			containerMeta: &runtime.ContainerMetadata{"kube-scheduler", 0},
+			expected:      "/var/log/pods/099f1c2b79126109140a1f77e211df00/kube-scheduler/0.log",
+		},
+		{
+			logDirectory:  "/var/log/pods/d875aada-9920-11e8-bfef-0242ac11001e/",
+			containerMeta: &runtime.ContainerMetadata{"kube-proxy", 10},
+			expected:      "/var/log/pods/d875aada-9920-11e8-bfef-0242ac11001e/kube-proxy/10.log",
+		},
+	}
+
+	for _, test := range testCases {
+		logPath := makeupLogPath(test.logDirectory, test.containerMeta)
+		if !reflect.DeepEqual(test.expected, logPath) {
+			t.Fatalf("unexpected logPath returned by makeupLogPath")
+		}
+	}
+}
+
 func Test_toCriContainerState(t *testing.T) {
 	testCases := []struct {
 		input    apitypes.Status