Skip to content

Commit

Permalink
UPSTREAM: <carry>: Remove reserved CPUs from default set
Browse files Browse the repository at this point in the history
Remove reserved CPUs from default set when workload partitioning is
enabled.

Co-Authored-By: Brent Rowsell <browsell@redhat.com>
Signed-off-by: Don Penney <dpenney@redhat.com>

OpenShift-Rebase-Source: 32af64c
  • Loading branch information
donpenney authored and sanchezl committed Dec 20, 2022
1 parent ce84735 commit f047b8a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkg/kubelet/cm/cpumanager/policy_static.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask"
"k8s.io/kubernetes/pkg/kubelet/managed"
"k8s.io/kubernetes/pkg/kubelet/metrics"
)

Expand Down Expand Up @@ -180,6 +181,10 @@ func (p *staticPolicy) validateState(s state.State) error {
// state is empty initialize
allCPUs := p.topology.CPUDetails.CPUs()
s.SetDefaultCPUSet(allCPUs)
if managed.IsEnabled() {
defaultCpus := s.GetDefaultCPUSet().Difference(p.reserved)
s.SetDefaultCPUSet(defaultCpus)
}
return nil
}

Expand Down

0 comments on commit f047b8a

Please sign in to comment.