Skip to content

Use hv1 effective capacity for weighing + filtering #583

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
PhilippMatthes merged 1 commit into from
Mar 17, 2026
Merged

Use hv1 effective capacity for weighing + filtering #583

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion internal/scheduling/nova/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func newHypervisor(name, cpuCap, cpuAlloc, memCap, memAlloc string) *hv1.Hypervi
Name: name,
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse(cpuCap),
hv1.ResourceMemory: resource.MustParse(memCap),
},
Expand Down
10 changes: 8 additions & 2 deletions internal/scheduling/nova/plugins/filters/filter_has_enough_capacity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,14 @@ func (s *FilterHasEnoughCapacity) Run(traceLog *slog.Logger, request api.Externa
return nil, err
}
for _, hv := range hvs.Items {
// Start with the total capacity.
freeResourcesByHost[hv.Name] = hv.Status.Capacity
// This case would be caught below, but we want to log this explicitly.
if hv.Status.EffectiveCapacity == nil {
traceLog.Warn("hypervisor with nil effective capacity, skipping", "host", hv.Name)
continue
}

// Start with the total effective capacity which is capacity * overcommit ratio.
freeResourcesByHost[hv.Name] = hv.Status.EffectiveCapacity

// Subtract allocated resources.
for resourceName, allocated := range hv.Status.Allocation {
Expand Down
2 changes: 1 addition & 1 deletion internal/scheduling/nova/plugins/filters/filter_has_enough_capacity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func newHypervisor(name, cpuCap, cpuAlloc, memCap, memAlloc string) *hv1.Hypervi
Name: name,
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse(cpuCap),
hv1.ResourceMemory: resource.MustParse(memCap),
},
Expand Down
7 changes: 4 additions & 3 deletions internal/scheduling/nova/plugins/weighers/kvm_binpack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ func (s *KVMBinpackStep) Run(traceLog *slog.Logger, request api.ExternalSchedule
var totalWeightedUtilization, totalWeight float64

for resourceName, weight := range s.Options.ResourceWeights {
capacity, ok := hv.Status.Capacity[resourceName]
// Effective capacity = capacity * overcommit ratio.
capacity, ok := hv.Status.EffectiveCapacity[resourceName]
if !ok {
traceLog.Warn("no capacity in status, skipping",
traceLog.Warn("no effective capacity in status, skipping",
"host", host, "resource", resourceName)
continue
}
if capacity.IsZero() {
traceLog.Warn("capacity is zero, skipping",
traceLog.Warn("effective capacity is zero, skipping",
"host", host, "resource", resourceName)
continue
}
Expand Down
8 changes: 4 additions & 4 deletions internal/scheduling/nova/plugins/weighers/kvm_binpack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func newHypervisor(name, capacityCPU, capacityMem, allocationCPU, allocationMem
Name: name,
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse(capacityCPU),
hv1.ResourceMemory: resource.MustParse(capacityMem),
},
Expand Down Expand Up @@ -343,7 +343,7 @@ func TestKVMBinpackStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host1"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("0"),
hv1.ResourceMemory: resource.MustParse("100Gi"),
},
Expand Down Expand Up @@ -371,7 +371,7 @@ func TestKVMBinpackStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host1"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("100"),
},
Allocation: map[hv1.ResourceName]resource.Quantity{
Expand All @@ -397,7 +397,7 @@ func TestKVMBinpackStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host1"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
// No CPU capacity
},
Allocation: map[hv1.ResourceName]resource.Quantity{
Expand Down
15 changes: 8 additions & 7 deletions internal/scheduling/nova/plugins/weighers/kvm_prefer_smaller_hosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ func (s *KVMPreferSmallerHostsStep) Run(traceLog *slog.Logger, request api.Exter
if _, ok := result.Activations[hv.Name]; !ok {
continue
}
capacity, ok := hv.Status.Capacity[resourceName]
// Effective capacity = capacity * overcommit ratio.
capacity, ok := hv.Status.EffectiveCapacity[resourceName]
if !ok {
traceLog.Warn("hypervisor has no capacity for resource, skipping",
traceLog.Warn("hypervisor has no effective capacity for resource, skipping",
"host", hv.Name, "resource", resourceName)
continue
}
Expand All @@ -106,9 +107,9 @@ func (s *KVMPreferSmallerHostsStep) Run(traceLog *slog.Logger, request api.Exter
var totalWeightedScore, totalWeight float64

for resourceName, weight := range s.Options.ResourceWeights {
capacity, ok := hv.Status.Capacity[resourceName]
capacity, ok := hv.Status.EffectiveCapacity[resourceName]
if !ok {
traceLog.Warn("hypervisor has no capacity for resource, skipping",
traceLog.Warn("hypervisor has no effective capacity for resource, skipping",
"host", hv.Name, "resource", resourceName)
continue
}
Expand All @@ -117,14 +118,14 @@ func (s *KVMPreferSmallerHostsStep) Run(traceLog *slog.Logger, request api.Exter
largestCap := largest[resourceName]

if smallestCap == nil || largestCap == nil {
traceLog.Warn("no capacity range found for resource, skipping",
traceLog.Warn("no effective capacity range found for resource, skipping",
"resource", resourceName)
continue
}

// If all hosts have the same capacity for this resource, skip it
// If all hosts have the same effective capacity for this resource, skip it
if smallestCap.Cmp(*largestCap) == 0 {
traceLog.Info("all hypervisors have the same capacity for resource, skipping",
traceLog.Info("all hypervisors have the same effective capacity for resource, skipping",
"resource", resourceName)
continue
}
Expand Down
12 changes: 6 additions & 6 deletions internal/scheduling/nova/plugins/weighers/kvm_prefer_smaller_hosts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func newHypervisorWithCapacity(name, capacityCPU, capacityMem string) *hv1.Hyper
Name: name,
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse(capacityCPU),
hv1.ResourceMemory: resource.MustParse(capacityMem),
},
Expand Down Expand Up @@ -376,7 +376,7 @@ func TestKVMPreferSmallerHostsStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host3"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("100"),
// No memory capacity
},
Expand Down Expand Up @@ -466,13 +466,13 @@ func TestKVMPreferSmallerHostsStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host1"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{},
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{},
},
},
{
ObjectMeta: metav1.ObjectMeta{Name: "host2"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{},
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{},
},
},
},
Expand Down Expand Up @@ -534,7 +534,7 @@ func TestKVMPreferSmallerHostsStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host1"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceMemory: resource.MustParse("64Gi"),
// No CPU
},
Expand All @@ -543,7 +543,7 @@ func TestKVMPreferSmallerHostsStep_Run(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "host2"},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceMemory: resource.MustParse("128Gi"),
// No CPU
},
Expand Down