github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unncessary errors.Unwrap calls

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee
2024-07-03 21:31:57 +08:00
parent 1e3dc23e16
commit ac992f9a92
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/server/stats/summary_sys_containers.go
View File

@@ -83,7 +83,7 @@ func (sp *summaryProviderImpl) GetSystemContainersCPUAndMemoryStats(nodeConfig c
} }
s, err := sp.provider.GetCgroupCPUAndMemoryStats(cont.name, cont.forceStatsUpdate) s, err := sp.provider.GetCgroupCPUAndMemoryStats(cont.name, cont.forceStatsUpdate)
if err != nil { 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) klog.V(4).InfoS("cgroup stats not found in memory cache", "containerName", cont.name)
} else { } else {
klog.ErrorS(err, "Failed to get system container stats", "containerName", cont.name) klog.ErrorS(err, "Failed to get system container stats", "containerName", cont.name)

4
pkg/kubelet/stats/provider.go
View File

@@ -115,7 +115,7 @@ func (p *Provider) RlimitStats() (*statsapi.RlimitStats, error) {
func (p *Provider) GetCgroupStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, *statsapi.NetworkStats, error) { func (p *Provider) GetCgroupStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, *statsapi.NetworkStats, error) {
info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats) info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats)
if err != nil { 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("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) 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) { func (p *Provider) GetCgroupCPUAndMemoryStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, error) {
info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats) info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats)
if err != nil { 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("cgroup stats not found for %q: %w", cgroupName, cadvisormemory.ErrDataNotFound)
} }
return nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err) return nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err)