Skip to content

VPA: Fix nil ptr when loading metrics and memory-saver=true #8052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 2 commits into from
Apr 28, 2025
Merged

VPA: Fix nil ptr when loading metrics and memory-saver=true #8052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71ddfb7
Fix nil ptr when loading metrics and `memory-saver=true`
plkokanov Apr 23, 2025
260c306
Address review comments
plkokanov Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,15 +499,17 @@ func (feeder *clusterStateFeeder) LoadRealTimeMetrics(ctx context.Context) {
sampleCount := 0
droppedSampleCount := 0
for _, containerMetrics := range containersMetrics {
podInitContainers := feeder.clusterState.Pods()[containerMetrics.ID.PodID].InitContainers
if slices.Contains(podInitContainers, containerMetrics.ID.ContainerName) {
klog.V(3).InfoS("Skipping metric samples for init container", "pod", klog.KRef(containerMetrics.ID.PodID.Namespace, containerMetrics.ID.PodID.PodName), "container", containerMetrics.ID.ContainerName)
droppedSampleCount += len(containerMetrics.Usage)
continue
// Container metrics are fetched for all pods, however, not all pod states are tracked in memory saver mode.
if pod, exists := feeder.clusterState.Pods()[containerMetrics.ID.PodID]; exists && pod != nil {
Copy link
Member

@raywainman raywainman Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a similar comment as below? Something like:

// Not all pod states are tracked in memory saver mode

Just helps give context behind the defensive check here.

Copy link
Contributor Author

@plkokanov plkokanov Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've applied the suggestion. PTAL when you can :)

if slices.Contains(pod.InitContainers, containerMetrics.ID.ContainerName) {
klog.V(3).InfoS("Skipping metric samples for init container", "pod", klog.KRef(containerMetrics.ID.PodID.Namespace, containerMetrics.ID.PodID.PodName), "container", containerMetrics.ID.ContainerName)
droppedSampleCount += len(containerMetrics.Usage)
continue
}
}
for _, sample := range newContainerUsageSamplesWithKey(containerMetrics) {
if err := feeder.clusterState.AddSample(sample); err != nil {
// Not all pod states are tracked in memory saver mode
// Not all pod states are tracked in memory saver mode.
if _, isKeyError := err.(model.KeyError); isKeyError && feeder.memorySaveMode {
continue
}
Expand Down
25 changes: 25 additions & 0 deletions vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ type fakeClusterState struct {
}

func (cs *fakeClusterState) AddSample(sample *model.ContainerUsageSampleWithKey) error {
_, podExists := cs.stubbedPods[sample.Container.PodID]
if !podExists {
return model.NewKeyError(sample.Container.PodID)
}
samplesForContainer := cs.addedSamples[sample.Container]
cs.addedSamples[sample.Container] = append(samplesForContainer, sample)
return nil
Expand Down Expand Up @@ -651,6 +655,27 @@ func TestClusterStateFeeder_LoadRealTimeMetrics(t *testing.T) {
samplesForContainer2 := clusterState.addedSamples[regularContainer2]
assert.Contains(t, samplesForContainer2, regularContainer2UsageSamples[0])
assert.Contains(t, samplesForContainer2, regularContainer2UsageSamples[1])

// Add extra container metrics for which there are no added pods to the state to simulate memory-saver=true
extraPodID := model.PodID{Namespace: namespaceName, PodName: "ExtraPod"}
extraContainer := model.ContainerID{PodID: extraPodID, ContainerName: "ExtraContainer"}
extraContainerMetricsSnapshot, _ := newContainerMetricsSnapshot(extraContainer, 200, 2048)
containerMetricsSnapshots = append(containerMetricsSnapshots, extraContainerMetricsSnapshot)

clusterState = NewFakeClusterState(nil, pods)

feeder = clusterStateFeeder{
memorySaveMode: true,
clusterState: clusterState,
metricsClient: fakeMetricsClient{snapshots: containerMetricsSnapshots},
}

feeder.LoadRealTimeMetrics(tctx)

assert.Equal(t, 2, len(clusterState.addedSamples))

_, samplesForExtraContainerExist := clusterState.addedSamples[extraContainer]
assert.False(t, samplesForExtraContainerExist)
}

type fakeHistoryProvider struct {
Expand Down
Loading