kubelet/stats: deduplicate makePodStorageStats

[haircommander]

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Deduplicates pod storage stats generation between CRI and cadvisor stats providers, and unifies their behavior. This fixes a bug where cadvisor stats provider excessively reported a GC'd directory as not found

Which issue(s) this PR fixes:

Fixes #106957

Special notes for your reviewer:

Does this PR introduce a user-facing change?

none

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

[haircommander]

/sig node

[ehashman]

/test pull-kubernetes-node-kubelet-serial-crio-cgroupv2

[haircommander]

/retest

[ehashman]

/priority important-longterm
/triage accepted

[ehashman]

Diff:

diff --git a/home/ehashman/tmp/foo2 b/home/ehashman/tmp/foo1
index 4ba09d2bead..2dc73b0ed5d 100644
--- a/home/ehashman/tmp/foo2
+++ b/home/ehashman/tmp/foo1
@@ -1,12 +1,12 @@
-func (p *criStatsProvider) makePodStorageStats(s *statsapi.PodStats, rootFsInfo *cadvisorapiv2.FsInfo) {
+func makePodStorageStats(s *statsapi.PodStats, rootFsInfo *cadvisorapiv2.FsInfo, resourceAnalyzer stats.ResourceAnalyzer, hostStatsProvider HostStatsProvider, isCRIStatsProvider bool) {
        podNs := s.PodRef.Namespace
        podName := s.PodRef.Name
        podUID := types.UID(s.PodRef.UID)
-       vstats, found := p.resourceAnalyzer.GetPodVolumeStats(podUID)
+       vstats, found := resourceAnalyzer.GetPodVolumeStats(podUID)
        if !found {
                return
        }
-       logStats, err := p.hostStatsProvider.getPodLogStats(podNs, podName, podUID, rootFsInfo)
+       logStats, err := hostStatsProvider.getPodLogStats(podNs, podName, podUID, rootFsInfo)
        if err != nil {
                klog.ErrorS(err, "Unable to fetch pod log stats", "pod", klog.KRef(podNs, podName))
                // If people do in-place upgrade, there might be pods still using
@@ -14,12 +14,12 @@ func (p *criStatsProvider) makePodStorageStats(s *statsapi.PodStats, rootFsInfo
                // We should continue generating other stats in that case.
                // calcEphemeralStorage tolerants logStats == nil.
        }
-       etcHostsStats, err := p.hostStatsProvider.getPodEtcHostsStats(podUID, rootFsInfo)
+       etcHostsStats, err := hostStatsProvider.getPodEtcHostsStats(podUID, rootFsInfo)
        if err != nil {
                klog.ErrorS(err, "Unable to fetch pod etc hosts stats", "pod", klog.KRef(podNs, podName))
        }
        ephemeralStats := make([]statsapi.VolumeStats, len(vstats.EphemeralVolumes))
        copy(ephemeralStats, vstats.EphemeralVolumes)
        s.VolumeStats = append(append([]statsapi.VolumeStats{}, vstats.EphemeralVolumes...), vstats.PersistentVolumes...)
-       s.EphemeralStorage = calcEphemeralStorage(s.Containers, ephemeralStats, rootFsInfo, logStats, etcHostsStats, true)
+       s.EphemeralStorage = calcEphemeralStorage(s.Containers, ephemeralStats, rootFsInfo, logStats, etcHostsStats, isCRIStatsProvider)
 }

[rpthms]

@haircommander Any chance you could take a look at the comments raised in this PR if you got time to spare? Thanks!

[haircommander]

/retest

[haircommander]

I personally think this route still makes sense. the behavior change is consistent with the cri stats manager, and makes logical sense to me. I am open to more feedback though

[aneagoe]

@andrewsykim @tallclair any chance you have some time to review this? It would be great to see some progress on this issue. Thanks!

[haircommander]

/assign @endocrimes @mrunalp @rphillips @saschagrunert

Anyone have any feedback or can we move forward with this

[haircommander]

Alright, I've updated to:
adopt the cadvisor stats provider behavior where we continue the stats collection, even if volume stats are not present
reduced the verbosity of the logs by increasing to 6

Thus standardizing behavior, keeping the old cadvisor behavior (as requested), and reducing verbosity for #106957

@dashpole @rphillips PTAL

[dchen1107]

/lgtm

[endocrimes]

/lgtm

[dims]

/milestone v1.26

cc @mrunalp

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: endocrimes, haircommander, mrunalp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• pkg/kubelet/stats/OWNERS [mrunalp]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[k8s-ci-robot]

@haircommander: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-kubernetes-node-kubelet-serial-crio-cgroupv2	5175e278bb8715e7c413c4f6a80bed4be1c698bd	link	false	/test pull-kubernetes-node-kubelet-serial-crio-cgroupv2

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[k8s-triage-robot]

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

• The PR does have any do-not-merge/* labels
• The PR does not have the needs-ok-to-test label
• The PR is mergeable (does not have a needs-rebase label)
• The PR is approved (has cncf-cla: yes, lgtm, approved labels)
• The PR is failing tests required for merge

You can:

• Review the full test history for this PR
• Prevent this bot from retesting with /lgtm cancel or /hold
• Help make our tests less flaky by following our Flaky Tests Guide

/retest