From d58768b351c04be4518d991cf6f4c891fcc8d05a Mon Sep 17 00:00:00 2001 From: hurf Date: Fri, 12 Jun 2015 15:12:36 +0800 Subject: [PATCH] Shorten container ID in events Log only first 12 characters of container ID in events. --- pkg/kubelet/dockertools/manager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 66b28fd2c96..014e8b806b4 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -609,7 +609,7 @@ func (dm *DockerManager) runContainer( } if ref != nil { - dm.recorder.Eventf(ref, "created", "Created with docker id %v", dockerContainer.ID) + dm.recorder.Eventf(ref, "created", "Created with docker id %v", util.ShortenString(dockerContainer.ID, 12)) } binds := makeMountBindings(opts.Mounts) @@ -656,12 +656,12 @@ func (dm *DockerManager) runContainer( if err = dm.client.StartContainer(dockerContainer.ID, hc); err != nil { if ref != nil { dm.recorder.Eventf(ref, "failed", - "Failed to start with docker id %v with error: %v", dockerContainer.ID, err) + "Failed to start with docker id %v with error: %v", util.ShortenString(dockerContainer.ID, 12), err) } return "", err } if ref != nil { - dm.recorder.Eventf(ref, "started", "Started with docker id %v", dockerContainer.ID) + dm.recorder.Eventf(ref, "started", "Started with docker id %v", util.ShortenString(dockerContainer.ID, 12)) } return dockerContainer.ID, nil } @@ -1141,7 +1141,7 @@ func (dm *DockerManager) killContainer(containerID types.UID) error { glog.Warningf("No ref for pod '%v'", ID) } else { // TODO: pass reason down here, and state, or move this call up the stack. - dm.recorder.Eventf(ref, "killing", "Killing %v", ID) + dm.recorder.Eventf(ref, "killing", "Killing with docker id %v", util.ShortenString(ID, 12)) } return err }