Skip to content

balloons: fix publishing PCT HP CPU cores as extended resources #711

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

Merged
fmuyassarov merged 2 commits into from
Jun 29, 2026
Merged

balloons: fix publishing PCT HP CPU cores as extended resources #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0790d5
e2e: test balloons publishing PCT HP CPUs as extended resources
askervin Jun 29, 2026
338ec91
balloons: fix publishing PCT HP CPUs as extended resources
askervin Jun 29, 2026
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
2 changes: 1 addition & 1 deletion cmd/plugins/balloons/policy/balloons-policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ func (p *balloons) GetExtendedResources() map[string]resource.Quantity {
if free < 0 {
free = 0
}
out["cpuclass.balloons.nri.io/"+cc.Name] = *resource.NewMilliQuantity(int64(free), resource.DecimalSI)
out["cpuclass.balloons.nri.io/"+cc.Name] = *resource.NewQuantity(int64(free), resource.DecimalSI)
}
return out
}
Expand Down
6 changes: 6 additions & 0 deletions test/e2e/policies.test-suite/balloons/balloons-busybox.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@ spec:
$(if [ -n "${MEMREQ}" ]; then echo "
memory: '${MEMREQ}'
"; fi)
$(for extreq in "${EXTREQ[@]}"; do echo "
$extreq
"; done)
$(if [ -n "${CPULIM}" ]; then echo "
limits:
cpu: ${CPULIM}
$(if [ -n "$MEMLIM" ]; then echo "
memory: '${MEMLIM}'
"; fi)
$(for extlim in "${EXTLIM[@]}"; do echo "
$extlim
"; done)
"; fi)
"; fi)
"; done )
Expand Down
1 change: 1 addition & 0 deletions test/e2e/policies.test-suite/balloons/n4c16/test19-pct/balloons-pct-managed.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ config:
minFreq: "turbo"
maxFreq: "turbo"
pctPriority: high
publishExtendedResource: true
- name: pct-lp
minFreq: "min"
maxFreq: "base"
Expand Down
16 changes: 16 additions & 0 deletions test/e2e/policies.test-suite/balloons/n4c16/test19-pct/code.var.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,15 @@ wait-assert-log-contains 'ConfigureClos.*ClosID:0 MinFreq:3800000 MaxFreq:380000
wait-assert-log-contains 'ConfigureClos.*ClosID:3 MinFreq:800000 MaxFreq:2900000' "LP CLOS 3 not programmed with MinFreq=min (800000) MaxFreq=base (2900000)"
wait-assert-log-contains 'EnableCP done' "EnableCP missing"

vm-command "kubectl get nodes -o json | jq -r '
.items[] | (.status.capacity[\"cpuclass.balloons.nri.io/pct-hp\"] // \"extended resource missing\")'"
[ "$COMMAND_OUTPUT" == "4" ] || \
command-error "expected 4 PCT HP CPUs published as extended resources"

# Phase 1.2: schedule a pod in the HP balloon.
CPUREQ=1 CPULIM=1 MEMREQ=10M MEMLIM=10M \
EXTREQ="cpuclass.balloons.nri.io/pct-hp: \"1\"" \
EXTLIM="cpuclass.balloons.nri.io/pct-hp: \"1\"" \
POD_ANNOTATION="balloon.balloons.resource-policy.nri.io: pct-hp-bln" CONTCOUNT=1 \
create balloons-busybox
wait-assert-log-contains 'associated cpus .* to CLOS 0' "HP pod CPUs not associated to CLOS 0"
Expand Down Expand Up @@ -138,6 +145,8 @@ verify 'cpus["pod1c0"].issubset({"cpu10","cpu11","cpu12","cpu13"})'
# balloon should land on pkg1 because it has the larger HP room,
# even though pkg0 also has free CPUs.
CPUREQ=1 CPULIM=1 MEMREQ=10M MEMLIM=10M \
EXTREQ="cpuclass.balloons.nri.io/pct-hp: \"1\"" \
EXTLIM="cpuclass.balloons.nri.io/pct-hp: \"1\"" \
POD_ANNOTATION="balloon.balloons.resource-policy.nri.io: pct-hp2-bln" CONTCOUNT=1 \
create balloons-busybox
report allowed
Expand All @@ -159,6 +168,8 @@ verify 'packages["pod2c0"] != packages["pod0c0"]'
pct-log 500
prev_to_clos0=$(grep -c 'to CLOS 0' <<< "$COMMAND_OUTPUT")
CPUREQ=1 CPULIM=1 MEMREQ=10M MEMLIM=10M \
EXTREQ="cpuclass.balloons.nri.io/pct-hp: \"1\"" \
EXTLIM="cpuclass.balloons.nri.io/pct-hp: \"1\"" \
POD_ANNOTATION="balloon.balloons.resource-policy.nri.io: pct-hp2-bln" CONTCOUNT=1 \
create balloons-busybox
wait-assert-log-grew 'to CLOS 0' "$prev_to_clos0" "resize of pct-hp2-bln did not associate the new CPU(s) to CLOS 0"
Expand Down Expand Up @@ -201,6 +212,11 @@ wait-assert-log-grew 'to CLOS 3' "$prev_to_clos3" "after deleting remaining pods

helm-terminate

vm-command "kubectl get nodes -o json | jq -r '
.items[] | (.status.capacity[\"cpuclass.balloons.nri.io/pct-hp\"] // \"extended resource missing\")'"
[ "$COMMAND_OUTPUT" == "extended resource missing" ] || \
command-error "expected published extended resources to be cleaned up and missing after uninstall"

###############################################################################
# Phase 2: Assoc-only mode (sstClosID without pctPriority)
###############################################################################
Expand Down
Loading