From 213c3785623ba291d39a30d4b4f84a45486cffaa Mon Sep 17 00:00:00 2001 From: Bruce Ma Date: Mon, 14 Oct 2019 20:17:27 +0800 Subject: [PATCH 1/2] modify error output in cniNetworkPlugin Signed-off-by: Bruce Ma --- pkg/kubelet/dockershim/network/cni/cni.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockershim/network/cni/cni.go b/pkg/kubelet/dockershim/network/cni/cni.go index cb353219a06..19e8f3eea8f 100644 --- a/pkg/kubelet/dockershim/network/cni/cni.go +++ b/pkg/kubelet/dockershim/network/cni/cni.go @@ -191,7 +191,7 @@ func getDefaultCNINetwork(confDir string, binDirs []string) (*cniNetwork, error) } } if len(confList.Plugins) == 0 { - klog.Warningf("CNI config list %s has no networks, skipping", confFile) + klog.Warningf("CNI config list %s has no networks, skipping", string(confList.Bytes)) continue } @@ -199,7 +199,7 @@ func getDefaultCNINetwork(confDir string, binDirs []string) (*cniNetwork, error) // all plugins of this config exist on disk caps, err := cniConfig.ValidateNetworkList(context.TODO(), confList) if err != nil { - klog.Warningf("Error validating CNI config %v: %v", confList, err) + klog.Warningf("Error validating CNI config list %s: %v", string(confList.Bytes), err) continue } From fe50e904eb860baf1281d9e1885e8f48a106bd54 Mon Sep 17 00:00:00 2001 From: Bruce Ma Date: Tue, 5 Nov 2019 17:52:13 +0800 Subject: [PATCH 2/2] restrict max string length in log Signed-off-by: Bruce Ma --- pkg/kubelet/dockershim/network/cni/cni.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockershim/network/cni/cni.go b/pkg/kubelet/dockershim/network/cni/cni.go index 19e8f3eea8f..5c471f9272d 100644 --- a/pkg/kubelet/dockershim/network/cni/cni.go +++ b/pkg/kubelet/dockershim/network/cni/cni.go @@ -191,7 +191,7 @@ func getDefaultCNINetwork(confDir string, binDirs []string) (*cniNetwork, error) } } if len(confList.Plugins) == 0 { - klog.Warningf("CNI config list %s has no networks, skipping", string(confList.Bytes)) + klog.Warningf("CNI config list %s has no networks, skipping", string(confList.Bytes[:maxStringLengthInLog(len(confList.Bytes))])) continue } @@ -199,7 +199,7 @@ func getDefaultCNINetwork(confDir string, binDirs []string) (*cniNetwork, error) // all plugins of this config exist on disk caps, err := cniConfig.ValidateNetworkList(context.TODO(), confList) if err != nil { - klog.Warningf("Error validating CNI config list %s: %v", string(confList.Bytes), err) + klog.Warningf("Error validating CNI config list %s: %v", string(confList.Bytes[:maxStringLengthInLog(len(confList.Bytes))]), err) continue } @@ -462,3 +462,13 @@ func (plugin *cniNetworkPlugin) buildCNIRuntimeConf(podName string, podNs string return rt, nil } + +func maxStringLengthInLog(length int) int { + // we allow no more than 4096-length strings to be logged + const maxStringLength = 4096 + + if length < maxStringLength { + return length + } + return maxStringLength +}