Merge pull request #793 from luomingmeng/dev/fix-qrm-cpu-memory-state…

…-restore fix(qrm): qrm cpu/memory plugin state restore include headroom
kubewharf · Feb 27, 2025 · 19914b2 · 19914b2
2 parents 006edc1 + f350da7
commit 19914b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/pkg/agent/qrm-plugins/cpu/dynamicpolicy/state/state_checkpoint.go b/pkg/agent/qrm-plugins/cpu/dynamicpolicy/state/state_checkpoint.go
@@ -105,6 +105,7 @@ func (sc *stateCheckpoint) RestoreState(topology *machine.CPUTopology) error {
 
 	sc.cache.SetMachineState(generatedMachineState)
 	sc.cache.SetPodEntries(checkpoint.PodEntries)
+	sc.cache.SetNUMAHeadroom(checkpoint.NUMAHeadroom)
 	sc.cache.SetAllowSharedCoresOverlapReclaimedCores(checkpoint.AllowSharedCoresOverlapReclaimedCores)
 
 	if !reflect.DeepEqual(generatedMachineState, checkpoint.MachineState) {

diff --git a/pkg/agent/qrm-plugins/memory/dynamicpolicy/state/state_checkpoint.go b/pkg/agent/qrm-plugins/memory/dynamicpolicy/state/state_checkpoint.go
@@ -109,6 +109,7 @@ func (sc *stateCheckpoint) restoreState(machineInfo *info.MachineInfo, reservedM
 	}
 
 	sc.cache.SetMachineState(generatedResourcesMachineState)
+	sc.cache.SetNUMAHeadroom(checkpoint.NUMAHeadroom)
 	sc.cache.SetPodResourceEntries(checkpoint.PodResourceEntries)
 
 	if !reflect.DeepEqual(generatedResourcesMachineState, checkpoint.MachineState) {

diff --git a/pkg/controller/spd/cnc_test.go b/pkg/controller/spd/cnc_test.go
@@ -280,6 +280,7 @@ func Test_cncCacheController_Run(t *testing.T) {
 			go spdController.Run()
 			synced := cache.WaitForCacheSync(ctx.Done(), spdController.syncedFunc...)
 			assert.True(t, synced)
+			spdController.cncCacheController.clearUnusedConfig()
 			time.Sleep(1 * time.Second)
 
 			newCNC, err := controlCtx.Client.InternalClient.ConfigV1alpha1().CustomNodeConfigs().