mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-04-15 14:26:33 -04:00
Merge a9a92ddd6c into d3b9c54bd9
This commit is contained in:
Jing Zhang
GitHub
commit
b973f78a92
2 changed files with 207 additions and 2 deletions
|
|
@ -20,9 +20,11 @@ package stats
|
|||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"k8s.io/klog/v2"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
||||
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
|
||||
|
|
@ -107,7 +109,7 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
|
|||
nodeStats := statsapi.NodeStats{
|
||||
NodeName: node.Name,
|
||||
CPU: rootStats.CPU,
|
||||
Memory: rootStats.Memory,
|
||||
Memory: adjustForHugePages(rootStats.Memory, node),
|
||||
Swap: rootStats.Swap,
|
||||
Network: networkStats,
|
||||
StartTime: sp.systemBootTime,
|
||||
|
|
@ -147,7 +149,7 @@ func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*stats
|
|||
nodeStats := statsapi.NodeStats{
|
||||
NodeName: node.Name,
|
||||
CPU: rootStats.CPU,
|
||||
Memory: rootStats.Memory,
|
||||
Memory: adjustForHugePages(rootStats.Memory, node),
|
||||
Swap: rootStats.Swap,
|
||||
StartTime: rootStats.StartTime,
|
||||
SystemContainers: sp.GetSystemContainersCPUAndMemoryStats(ctx, nodeConfig, podStats, false),
|
||||
|
|
@ -158,3 +160,38 @@ func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*stats
|
|||
}
|
||||
return &summary, nil
|
||||
}
|
||||
|
||||
// adjustForHugePages returns a copy of memoryStats with AvailableBytes reduced
|
||||
// by the node's total hugepage capacity.
|
||||
//
|
||||
// The root cgroup's memory limit is set to MemTotal (which includes
|
||||
// hugepage-reserved RAM), but the memory cgroup controller does not track
|
||||
// hugetlb allocations in WorkingSet. This causes AvailableBytes
|
||||
// (limit - WorkingSet) to overstate real available regular memory by the
|
||||
// hugepage reservation amount, delaying eviction until the node is under
|
||||
// severe memory pressure.
|
||||
func adjustForHugePages(memory *statsapi.MemoryStats, node *v1.Node) *statsapi.MemoryStats {
|
||||
if memory == nil || memory.AvailableBytes == nil || node == nil {
|
||||
return memory
|
||||
}
|
||||
|
||||
var totalHugePageBytes uint64
|
||||
for name, quantity := range node.Status.Capacity {
|
||||
if strings.HasPrefix(string(name), string(v1.ResourceHugePagesPrefix)) {
|
||||
totalHugePageBytes += uint64(quantity.Value())
|
||||
}
|
||||
}
|
||||
if totalHugePageBytes == 0 {
|
||||
return memory
|
||||
}
|
||||
|
||||
adjusted := *memory
|
||||
if *adjusted.AvailableBytes > totalHugePageBytes {
|
||||
available := *adjusted.AvailableBytes - totalHugePageBytes
|
||||
adjusted.AvailableBytes = &available
|
||||
} else {
|
||||
available := uint64(0)
|
||||
adjusted.AvailableBytes = &available
|
||||
}
|
||||
return &adjusted
|
||||
}
|
||||
|
|
|
|||
168
pkg/kubelet/server/stats/summary_hugepages_test.go
Normal file
168
pkg/kubelet/server/stats/summary_hugepages_test.go
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
/*
|
||||
Copyright 2025 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package stats
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
|
||||
"k8s.io/utils/ptr"
|
||||
)
|
||||
|
||||
func TestAdjustForHugePages(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
memory *statsapi.MemoryStats
|
||||
node *v1.Node
|
||||
expectedAvailable *uint64
|
||||
}{
|
||||
{
|
||||
name: "nil memory stats",
|
||||
memory: nil,
|
||||
node: &v1.Node{},
|
||||
expectedAvailable: nil,
|
||||
},
|
||||
{
|
||||
name: "nil AvailableBytes",
|
||||
memory: &statsapi.MemoryStats{
|
||||
WorkingSetBytes: ptr.To[uint64](1000),
|
||||
},
|
||||
node: &v1.Node{},
|
||||
expectedAvailable: nil,
|
||||
},
|
||||
{
|
||||
name: "nil node",
|
||||
memory: &statsapi.MemoryStats{
|
||||
AvailableBytes: ptr.To[uint64](10000),
|
||||
WorkingSetBytes: ptr.To[uint64](1000),
|
||||
},
|
||||
node: nil,
|
||||
expectedAvailable: ptr.To[uint64](10000),
|
||||
},
|
||||
{
|
||||
name: "no hugepages in capacity",
|
||||
memory: &statsapi.MemoryStats{
|
||||
AvailableBytes: ptr.To[uint64](10000),
|
||||
WorkingSetBytes: ptr.To[uint64](1000),
|
||||
},
|
||||
node: &v1.Node{
|
||||
Status: v1.NodeStatus{
|
||||
Capacity: v1.ResourceList{
|
||||
v1.ResourceMemory: *resource.NewQuantity(20000, resource.BinarySI),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedAvailable: ptr.To[uint64](10000),
|
||||
},
|
||||
{
|
||||
name: "hugepages subtracted from available",
|
||||
memory: &statsapi.MemoryStats{
|
||||
AvailableBytes: ptr.To[uint64](10 * 1024 * 1024 * 1024), // 10Gi
|
||||
WorkingSetBytes: ptr.To[uint64](50 * 1024 * 1024 * 1024), // 50Gi
|
||||
},
|
||||
node: &v1.Node{
|
||||
Status: v1.NodeStatus{
|
||||
Capacity: v1.ResourceList{
|
||||
v1.ResourceMemory: *resource.NewQuantity(64*1024*1024*1024, resource.BinarySI),
|
||||
v1.ResourceName("hugepages-1Gi"): *resource.NewQuantity(4*1024*1024*1024, resource.BinarySI),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedAvailable: ptr.To[uint64](6 * 1024 * 1024 * 1024), // 10Gi - 4Gi = 6Gi
|
||||
},
|
||||
{
|
||||
name: "multiple hugepage sizes",
|
||||
memory: &statsapi.MemoryStats{
|
||||
AvailableBytes: ptr.To[uint64](10 * 1024 * 1024 * 1024),
|
||||
WorkingSetBytes: ptr.To[uint64](50 * 1024 * 1024 * 1024),
|
||||
},
|
||||
node: &v1.Node{
|
||||
Status: v1.NodeStatus{
|
||||
Capacity: v1.ResourceList{
|
||||
v1.ResourceMemory: *resource.NewQuantity(64*1024*1024*1024, resource.BinarySI),
|
||||
v1.ResourceName("hugepages-1Gi"): *resource.NewQuantity(2*1024*1024*1024, resource.BinarySI),
|
||||
v1.ResourceName("hugepages-2Mi"): *resource.NewQuantity(1*1024*1024*1024, resource.BinarySI),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedAvailable: ptr.To[uint64](7 * 1024 * 1024 * 1024), // 10Gi - 3Gi = 7Gi
|
||||
},
|
||||
{
|
||||
name: "hugepages exceed available clamps to zero",
|
||||
memory: &statsapi.MemoryStats{
|
||||
AvailableBytes: ptr.To[uint64](2 * 1024 * 1024 * 1024), // 2Gi
|
||||
WorkingSetBytes: ptr.To[uint64](60 * 1024 * 1024 * 1024),
|
||||
},
|
||||
node: &v1.Node{
|
||||
Status: v1.NodeStatus{
|
||||
Capacity: v1.ResourceList{
|
||||
v1.ResourceMemory: *resource.NewQuantity(64*1024*1024*1024, resource.BinarySI),
|
||||
v1.ResourceName("hugepages-1Gi"): *resource.NewQuantity(4*1024*1024*1024, resource.BinarySI),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedAvailable: ptr.To[uint64](0),
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
result := adjustForHugePages(tc.memory, tc.node)
|
||||
if tc.expectedAvailable == nil {
|
||||
if result != nil && result.AvailableBytes != nil {
|
||||
if tc.memory == nil || tc.memory.AvailableBytes == nil {
|
||||
t.Errorf("expected nil AvailableBytes, got %d", *result.AvailableBytes)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
if result == nil || result.AvailableBytes == nil {
|
||||
t.Fatalf("expected AvailableBytes=%d, got nil", *tc.expectedAvailable)
|
||||
}
|
||||
if *result.AvailableBytes != *tc.expectedAvailable {
|
||||
t.Errorf("expected AvailableBytes=%d, got %d", *tc.expectedAvailable, *result.AvailableBytes)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdjustForHugePagesDoesNotMutateOriginal(t *testing.T) {
|
||||
original := &statsapi.MemoryStats{
|
||||
AvailableBytes: ptr.To[uint64](10 * 1024 * 1024 * 1024),
|
||||
WorkingSetBytes: ptr.To[uint64](50 * 1024 * 1024 * 1024),
|
||||
}
|
||||
originalAvailable := *original.AvailableBytes
|
||||
|
||||
node := &v1.Node{
|
||||
Status: v1.NodeStatus{
|
||||
Capacity: v1.ResourceList{
|
||||
v1.ResourceName("hugepages-1Gi"): *resource.NewQuantity(4*1024*1024*1024, resource.BinarySI),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
result := adjustForHugePages(original, node)
|
||||
|
||||
if *original.AvailableBytes != originalAvailable {
|
||||
t.Errorf("original AvailableBytes was mutated: expected %d, got %d", originalAvailable, *original.AvailableBytes)
|
||||
}
|
||||
if result == original {
|
||||
t.Error("adjustForHugePages should return a new copy, not the original pointer")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue