Merge pull request kubewharf#681 from nightmeng/dev/fix-reclaim-core-…

…hints feat(qrm): fix reclaimed cores topology hints
luomingmeng · Aug 23, 2024 · cb9c984 · cb9c984
2 parents 0efda71 + 99996fc
commit cb9c984
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy_hint_handlers.go b/pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy_hint_handlers.go
@@ -86,10 +86,18 @@ func (p *DynamicPolicy) sharedCoresHintHandler(ctx context.Context,
 func (p *DynamicPolicy) reclaimedCoresHintHandler(ctx context.Context,
 	req *pluginapi.ResourceRequest,
 ) (*pluginapi.ResourceHintsResponse, error) {
+	if req == nil {
+		return nil, fmt.Errorf("got nil request")
+	}
+
 	if util.PodInplaceUpdateResizing(req) {
 		return nil, fmt.Errorf("not support inplace update resize for reclaimed cores")
 	}
-	return p.sharedCoresHintHandler(ctx, req)
+
+	return util.PackResourceHintsResponse(req, string(v1.ResourceCPU),
+		map[string]*pluginapi.ListOfTopologyHints{
+			string(v1.ResourceCPU): nil, // indicates that there is no numa preference
+		})
 }
 
 func (p *DynamicPolicy) dedicatedCoresHintHandler(ctx context.Context,

diff --git a/pkg/agent/qrm-plugins/memory/dynamicpolicy/policy_hint_handlers.go b/pkg/agent/qrm-plugins/memory/dynamicpolicy/policy_hint_handlers.go
@@ -72,12 +72,20 @@ func (p *DynamicPolicy) sharedCoresHintHandler(ctx context.Context,
 func (p *DynamicPolicy) reclaimedCoresHintHandler(ctx context.Context,
 	req *pluginapi.ResourceRequest,
 ) (*pluginapi.ResourceHintsResponse, error) {
+	if req == nil {
+		return nil, fmt.Errorf("got nil request")
+	}
+
 	if util.PodInplaceUpdateResizing(req) {
 		general.Errorf("pod: %s/%s, container: %s request to memory inplace update resize, but not support reclaimed cores",
 			req.PodNamespace, req.PodName, req.ContainerName)
 		return nil, fmt.Errorf("not support inplace update resize for reclaimed cores")
 	}
-	return p.sharedCoresHintHandler(ctx, req)
+
+	return util.PackResourceHintsResponse(req, string(v1.ResourceMemory),
+		map[string]*pluginapi.ListOfTopologyHints{
+			string(v1.ResourceMemory): nil, // indicates that there is no numa preference
+		})
 }
 
 func (p *DynamicPolicy) dedicatedCoresHintHandler(ctx context.Context,