From ac992f9a925b16020a0da01186cc71668a93fd6e Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 3 Jul 2024 21:31:57 +0800 Subject: [PATCH] remove unncessary errors.Unwrap calls Signed-off-by: Gyuho Lee --- pkg/kubelet/server/stats/summary_sys_containers.go | 2 +- pkg/kubelet/stats/provider.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/server/stats/summary_sys_containers.go b/pkg/kubelet/server/stats/summary_sys_containers.go index 04f141dae00..35d1135c630 100644 --- a/pkg/kubelet/server/stats/summary_sys_containers.go +++ b/pkg/kubelet/server/stats/summary_sys_containers.go @@ -83,7 +83,7 @@ func (sp *summaryProviderImpl) GetSystemContainersCPUAndMemoryStats(nodeConfig c } s, err := sp.provider.GetCgroupCPUAndMemoryStats(cont.name, cont.forceStatsUpdate) if err != nil { - if errors.Is(errors.Unwrap(err), cadvisormemory.ErrDataNotFound) { + if errors.Is(err, cadvisormemory.ErrDataNotFound) { klog.V(4).InfoS("cgroup stats not found in memory cache", "containerName", cont.name) } else { klog.ErrorS(err, "Failed to get system container stats", "containerName", cont.name) diff --git a/pkg/kubelet/stats/provider.go b/pkg/kubelet/stats/provider.go index d3a63d37bf7..4b747c42a0c 100644 --- a/pkg/kubelet/stats/provider.go +++ b/pkg/kubelet/stats/provider.go @@ -115,7 +115,7 @@ func (p *Provider) RlimitStats() (*statsapi.RlimitStats, error) { func (p *Provider) GetCgroupStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, *statsapi.NetworkStats, error) { info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats) if err != nil { - if errors.Is(errors.Unwrap(err), cadvisormemory.ErrDataNotFound) { + if errors.Is(err, cadvisormemory.ErrDataNotFound) { return nil, nil, fmt.Errorf("cgroup stats not found for %q: %w", cgroupName, cadvisormemory.ErrDataNotFound) } return nil, nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err) @@ -131,7 +131,7 @@ func (p *Provider) GetCgroupStats(cgroupName string, updateStats bool) (*statsap func (p *Provider) GetCgroupCPUAndMemoryStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, error) { info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats) if err != nil { - if errors.Is(errors.Unwrap(err), cadvisormemory.ErrDataNotFound) { + if errors.Is(err, cadvisormemory.ErrDataNotFound) { return nil, fmt.Errorf("cgroup stats not found for %q: %w", cgroupName, cadvisormemory.ErrDataNotFound) } return nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err)