Skip to content

Commit 8c1681c

Browse files
authored
Merge pull request #1089 from luomingmeng/dev/revert-skip-validation-for-non-numa_exclusive-allocations
Revert "fix(cpu-advisor): skip validation for non-numa_exclusive allocations"
2 parents 9d6f0ff + bb294cd commit 8c1681c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

pkg/agent/qrm-plugins/cpu/dynamicpolicy/validator/validator_cpu_advisor.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,13 @@ func (c *CPUAdvisorValidator) validateEntries(resp *advisorapi.ListAndWatchRespo
147147
}
148148
}
149149
} else {
150-
// skip if not numa_exclusive which is support adjust cpuset
151-
if !allocationInfo.CheckNumaExclusive() {
152-
continue
153-
}
154-
155150
calculationQuantity, err := calculationInfo.GetTotalQuantity()
156151
if err != nil {
157152
return fmt.Errorf("GetTotalQuantity failed with error: %v, pod: %s container: %s",
158153
err, podUID, containerName)
159154
}
160155

161-
// currently, we don't support strategy to adjust cpuset of dedicated_cores numa_binding and numa_exclusive containers.
156+
// currently, we don't support strategy to adjust cpuset of dedicated_cores containers.
162157
// for stability if the dedicated_cores container calculation result and allocation result, we will return error.
163158
if calculationQuantity != allocationInfo.AllocationResult.Size() {
164159
return fmt.Errorf("pod: %s container: %s calculation result: %d and allocation result: %d mismatch",

0 commit comments

Comments
 (0)