Skip to content
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

Jump to bottom

refactor(sysadvisor): refine memory guard #499

Merged
merged 1 commit into from
Apr 2, 2024
Merged

refactor(sysadvisor): refine memory guard #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
144 changes: 104 additions & 40 deletions pkg/agent/sysadvisor/plugin/qosaware/resource/memory/advisor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ type containerNUMAMetric struct {
metricValue metricutil.MetricData
podUID string
containerName string
numdID int
numaID int
}

type cgroupMetric struct {
Expand All @@ -184,6 +184,13 @@ type cgroupMetric struct {
cgroupPath string
}

type cgroupNUMAMetric struct {
metricName string
metricValue metricutil.MetricData
numaID int
cgroupPath string
}

var defaultPodList = []*v1.Pod{
{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -388,6 +395,33 @@ var cgroupMetrics = []cgroupMetric{
},
}

var cgroupNUMAMetrics = []cgroupNUMAMetric{
{
metricName: coreconsts.MetricsMemTotalPerNumaCgroup,
numaID: 0,
cgroupPath: "/kubepods/besteffort",
metricValue: metricutil.MetricData{Value: 6 << 30},
},
{
metricName: coreconsts.MetricsMemTotalPerNumaCgroup,
numaID: 1,
cgroupPath: "/kubepods/besteffort",
metricValue: metricutil.MetricData{Value: 6 << 30},
},
{
metricName: coreconsts.MetricsMemTotalPerNumaCgroup,
numaID: 2,
cgroupPath: "/kubepods/besteffort",
metricValue: metricutil.MetricData{Value: 6 << 30},
},
{
metricName: coreconsts.MetricsMemTotalPerNumaCgroup,
numaID: 3,
cgroupPath: "/kubepods/besteffort",
metricValue: metricutil.MetricData{Value: 6 << 30},
},
}

func TestUpdate(t *testing.T) {
t.Parallel()

Expand All @@ -405,6 +439,7 @@ func TestUpdate(t *testing.T) {
containerMetrics []containerMetric
containerNUMAMetrics []containerNUMAMetric
cgroupMetrics []cgroupMetric
cgroupNUMAMetrics []cgroupNUMAMetric
metricsFetcherSynced *bool
wantAdviceResult types.InternalMemoryCalculationResult
}{
Expand Down Expand Up @@ -648,42 +683,42 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 10 << 20},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemFilePerNumaContainer,
metricValue: metricutil.MetricData{Value: 9 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemFilePerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid3",
containerName: "c3",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemFilePerNumaContainer,
metricValue: metricutil.MetricData{Value: 10 << 20},
podUID: "uid1",
containerName: "c1",
numdID: 1,
numaID: 1,
},
{
metricName: coreconsts.MetricsMemFilePerNumaContainer,
metricValue: metricutil.MetricData{Value: 9 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 1,
numaID: 1,
},
{
metricName: coreconsts.MetricsMemFilePerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid3",
containerName: "c3",
numdID: 1,
numaID: 1,
},
},
wantAdviceResult: types.InternalMemoryCalculationResult{
Expand All @@ -702,7 +737,39 @@ func TestUpdate(t *testing.T) {
},
},
{
name: "set reclaimed group memory limit",
name: "set reclaimed group memory limit(succeeded)",
pools: map[string]*types.PoolInfo{
state.PoolNameReserve: {
PoolName: state.PoolNameReserve,
TopologyAwareAssignments: map[int]machine.CPUSet{
0: machine.MustParse("0"),
1: machine.MustParse("24"),
},
OriginalTopologyAwareAssignments: map[int]machine.CPUSet{
0: machine.MustParse("0"),
1: machine.MustParse("24"),
},
},
},
reclaimedEnable: true,
needRecvAdvices: true,
wantHeadroom: *resource.NewQuantity(996<<30, resource.DecimalSI),
nodeMetrics: defaultNodeMetrics,
numaMetrics: defaultNumaMetrics,
cgroupMetrics: cgroupMetrics,
cgroupNUMAMetrics: cgroupNUMAMetrics,
plugins: []types.MemoryAdvisorPluginName{memadvisorplugin.MemoryGuard},
wantAdviceResult: types.InternalMemoryCalculationResult{
ExtraEntries: []types.ExtraMemoryAdvices{
{
CgroupPath: "/kubepods/besteffort",
Values: map[string]string{string(memoryadvisor.ControlKnobKeyMemoryLimitInBytes): strconv.Itoa(240 << 30)},
},
},
},
},
{
name: "set reclaimed group memory limit(failed)",
pools: map[string]*types.PoolInfo{
state.PoolNameReserve: {
PoolName: state.PoolNameReserve,
Expand All @@ -721,15 +788,9 @@ func TestUpdate(t *testing.T) {
wantHeadroom: *resource.NewQuantity(996<<30, resource.DecimalSI),
nodeMetrics: defaultNodeMetrics,
numaMetrics: defaultNumaMetrics,
cgroupMetrics: cgroupMetrics,
plugins: []types.MemoryAdvisorPluginName{memadvisorplugin.MemoryGuard},
wantAdviceResult: types.InternalMemoryCalculationResult{
ExtraEntries: []types.ExtraMemoryAdvices{
{
CgroupPath: "/kubepods/besteffort",
Values: map[string]string{string(memoryadvisor.ControlKnobKeyMemoryLimitInBytes): strconv.Itoa(375 << 30)},
},
},
ExtraEntries: []types.ExtraMemoryAdvices{},
},
},
{
Expand Down Expand Up @@ -1127,28 +1188,28 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid3",
containerName: "c3",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid4",
containerName: "c4",
numdID: 0,
numaID: 0,
},
},
wantHeadroom: *resource.NewQuantity(980<<30, resource.DecimalSI),
Expand Down Expand Up @@ -1286,28 +1347,28 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 2 << 10},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 10},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 10},
podUID: "uid3",
containerName: "c3",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 512 << 10},
podUID: "uid4",
containerName: "c4",
numdID: 0,
numaID: 0,
},
},
wantHeadroom: *resource.NewQuantity(980<<30, resource.DecimalSI),
Expand Down Expand Up @@ -1412,28 +1473,28 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid3",
containerName: "c3",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 512 << 20},
podUID: "uid4",
containerName: "c4",
numdID: 0,
numaID: 0,
},
},
wantHeadroom: *resource.NewQuantity(980<<30, resource.DecimalSI),
Expand Down Expand Up @@ -1571,28 +1632,28 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid3",
containerName: "c3",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid4",
containerName: "c4",
numdID: 0,
numaID: 0,
},
},
wantHeadroom: *resource.NewQuantity(980<<30, resource.DecimalSI),
Expand Down Expand Up @@ -1705,28 +1766,28 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 2,
numaID: 2,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid4",
containerName: "c4",
numdID: 2,
numaID: 2,
},
},
wantHeadroom: *resource.NewQuantity(980<<30, resource.DecimalSI),
Expand Down Expand Up @@ -1837,28 +1898,28 @@ func TestUpdate(t *testing.T) {
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid2",
containerName: "c2",
numdID: 0,
numaID: 0,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 2 << 30},
podUID: "uid1",
containerName: "c1",
numdID: 2,
numaID: 2,
},
{
metricName: coreconsts.MetricsMemAnonPerNumaContainer,
metricValue: metricutil.MetricData{Value: 1 << 30},
podUID: "uid4",
containerName: "c4",
numdID: 2,
numaID: 2,
},
},
wantHeadroom: *resource.NewQuantity(980<<30, resource.DecimalSI),
Expand Down Expand Up @@ -1896,11 +1957,14 @@ func TestUpdate(t *testing.T) {
metricsFetcher.SetContainerMetric(containerMetric.podUID, containerMetric.containerName, containerMetric.metricName, containerMetric.metricValue)
}
for _, containerNUMAMetric := range tt.containerNUMAMetrics {
metricsFetcher.SetContainerNumaMetric(containerNUMAMetric.podUID, containerNUMAMetric.containerName, strconv.Itoa(containerNUMAMetric.numdID), containerNUMAMetric.metricName, containerNUMAMetric.metricValue)
metricsFetcher.SetContainerNumaMetric(containerNUMAMetric.podUID, containerNUMAMetric.containerName, strconv.Itoa(containerNUMAMetric.numaID), containerNUMAMetric.metricName, containerNUMAMetric.metricValue)
}
for _, qosClassMetric := range tt.cgroupMetrics {
metricsFetcher.SetCgroupMetric(qosClassMetric.cgroupPath, qosClassMetric.metricName, qosClassMetric.metricValue)
}
for _, cgroupNUMAMetric := range tt.cgroupNUMAMetrics {
metricsFetcher.SetCgroupNumaMetric(cgroupNUMAMetric.cgroupPath, cgroupNUMAMetric.numaID, cgroupNUMAMetric.metricName, cgroupNUMAMetric.metricValue)
}
if tt.metricsFetcherSynced != nil {
metricsFetcher.SetSynced(*tt.metricsFetcherSynced)
}
Expand Down
Loading
Loading