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

fix(qrm): fix numaBindingHintHandler calculateHints before GetHintsFr… #765

Merged
merged 1 commit into from
Jan 20, 2025
+13 −13
Merged

fix(qrm): fix numaBindingHintHandler calculateHints before GetHintsFr… #765

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
26 changes: 13 additions & 13 deletions pkg/agent/qrm-plugins/memory/dynamicpolicy/policy_hint_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,19 +215,7 @@ func (p *DynamicPolicy) numaBindingHintHandler(_ context.Context,
hints = regenerateHints(allocationInfo, false)
}
} else {
// otherwise, calculate hint for container without allocated memory
var calculateErr error
// calculate hint for container without allocated memory
hints, calculateErr = p.calculateHints(uint64(podAggregatedRequest), resourcesMachineState, req)
if calculateErr != nil {
general.Errorf("failed to calculate hints for pod: %s/%s, container: %s, error: %v",
req.PodNamespace, req.PodName, req.ContainerName, calculateErr)
return nil, fmt.Errorf("calculateHints failed with error: %v", calculateErr)
}
}

// if hints exists in extra state-file, prefer to use them
if hints == nil {
// if hints exists in extra state-file, prefer to use them
availableNUMAs := resourcesMachineState[v1.ResourceMemory].GetNUMANodesWithoutSharedOrDedicatedNUMABindingPods()

var extraErr error
Expand All @@ -239,6 +227,18 @@ func (p *DynamicPolicy) numaBindingHintHandler(_ context.Context,
}
}

if hints == nil {
// otherwise, calculate hint for container without allocated memory
var calculateErr error
// calculate hint for container without allocated memory
hints, calculateErr = p.calculateHints(uint64(podAggregatedRequest), resourcesMachineState, req)
if calculateErr != nil {
general.Errorf("failed to calculate hints for pod: %s/%s, container: %s, error: %v",
req.PodNamespace, req.PodName, req.ContainerName, calculateErr)
return nil, fmt.Errorf("calculateHints failed with error: %v", calculateErr)
}
}

general.Infof("memory hints for pod:%s/%s, container: %s success, hints: %v",
req.PodNamespace, req.PodName, req.ContainerName, hints)

Expand Down