mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
fix GetAllocatableCPUs in cpumanager
Signed-off-by: Garrybest <garrybest@foxmail.com>
This commit is contained in:
parent
ead1ef4450
commit
d446f5f90e
@ -25,9 +25,9 @@ import (
|
|||||||
cadvisorapi "github.com/google/cadvisor/info/v1"
|
cadvisorapi "github.com/google/cadvisor/info/v1"
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
|
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
|
|
||||||
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/containermap"
|
"k8s.io/kubernetes/pkg/kubelet/cm/containermap"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology"
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology"
|
||||||
@ -86,7 +86,7 @@ type Manager interface {
|
|||||||
// among this and other resource controllers.
|
// among this and other resource controllers.
|
||||||
GetPodTopologyHints(pod *v1.Pod) map[string][]topologymanager.TopologyHint
|
GetPodTopologyHints(pod *v1.Pod) map[string][]topologymanager.TopologyHint
|
||||||
|
|
||||||
// GetAllocatableCPUs returns the assignable (not allocated) CPUs
|
// GetAllocatableCPUs returns the total set of CPUs available for allocation.
|
||||||
GetAllocatableCPUs() cpuset.CPUSet
|
GetAllocatableCPUs() cpuset.CPUSet
|
||||||
|
|
||||||
// GetCPUAffinity returns cpuset which includes cpus from shared pools
|
// GetCPUAffinity returns cpuset which includes cpus from shared pools
|
||||||
|
@ -18,6 +18,7 @@ package cpumanager
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
|
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
|
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
|
||||||
@ -39,6 +40,6 @@ type Policy interface {
|
|||||||
// and is consulted to achieve NUMA aware resource alignment per Pod
|
// and is consulted to achieve NUMA aware resource alignment per Pod
|
||||||
// among this and other resource controllers.
|
// among this and other resource controllers.
|
||||||
GetPodTopologyHints(s state.State, pod *v1.Pod) map[string][]topologymanager.TopologyHint
|
GetPodTopologyHints(s state.State, pod *v1.Pod) map[string][]topologymanager.TopologyHint
|
||||||
// GetAllocatableCPUs returns the assignable (not allocated) CPUs
|
// GetAllocatableCPUs returns the total set of CPUs available for allocation.
|
||||||
GetAllocatableCPUs(m state.State) cpuset.CPUSet
|
GetAllocatableCPUs(m state.State) cpuset.CPUSet
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,7 @@ import (
|
|||||||
|
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
|
|
||||||
v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
|
v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology"
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology"
|
||||||
@ -223,8 +224,13 @@ func (p *staticPolicy) validateState(s state.State) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAllocatableCPUs returns the set of unassigned CPUs minus the reserved set.
|
// GetAllocatableCPUs returns the total set of CPUs available for allocation.
|
||||||
func (p *staticPolicy) GetAllocatableCPUs(s state.State) cpuset.CPUSet {
|
func (p *staticPolicy) GetAllocatableCPUs(s state.State) cpuset.CPUSet {
|
||||||
|
return p.topology.CPUDetails.CPUs().Difference(p.reserved)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAvailableCPUs returns the set of unassigned CPUs minus the reserved set.
|
||||||
|
func (p *staticPolicy) GetAvailableCPUs(s state.State) cpuset.CPUSet {
|
||||||
return s.GetDefaultCPUSet().Difference(p.reserved)
|
return s.GetDefaultCPUSet().Difference(p.reserved)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -324,7 +330,7 @@ func (p *staticPolicy) RemoveContainer(s state.State, podUID string, containerNa
|
|||||||
func (p *staticPolicy) allocateCPUs(s state.State, numCPUs int, numaAffinity bitmask.BitMask, reusableCPUs cpuset.CPUSet) (cpuset.CPUSet, error) {
|
func (p *staticPolicy) allocateCPUs(s state.State, numCPUs int, numaAffinity bitmask.BitMask, reusableCPUs cpuset.CPUSet) (cpuset.CPUSet, error) {
|
||||||
klog.InfoS("AllocateCPUs", "numCPUs", numCPUs, "socket", numaAffinity)
|
klog.InfoS("AllocateCPUs", "numCPUs", numCPUs, "socket", numaAffinity)
|
||||||
|
|
||||||
allocatableCPUs := p.GetAllocatableCPUs(s).Union(reusableCPUs)
|
allocatableCPUs := p.GetAvailableCPUs(s).Union(reusableCPUs)
|
||||||
|
|
||||||
// If there are aligned CPUs in numaAffinity, attempt to take those first.
|
// If there are aligned CPUs in numaAffinity, attempt to take those first.
|
||||||
result := cpuset.NewCPUSet()
|
result := cpuset.NewCPUSet()
|
||||||
@ -442,7 +448,7 @@ func (p *staticPolicy) GetTopologyHints(s state.State, pod *v1.Pod, container *v
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get a list of available CPUs.
|
// Get a list of available CPUs.
|
||||||
available := p.GetAllocatableCPUs(s)
|
available := p.GetAvailableCPUs(s)
|
||||||
|
|
||||||
// Get a list of reusable CPUs (e.g. CPUs reused from initContainers).
|
// Get a list of reusable CPUs (e.g. CPUs reused from initContainers).
|
||||||
// It should be an empty CPUSet for a newly created pod.
|
// It should be an empty CPUSet for a newly created pod.
|
||||||
@ -497,7 +503,7 @@ func (p *staticPolicy) GetPodTopologyHints(s state.State, pod *v1.Pod) map[strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get a list of available CPUs.
|
// Get a list of available CPUs.
|
||||||
available := p.GetAllocatableCPUs(s)
|
available := p.GetAvailableCPUs(s)
|
||||||
|
|
||||||
// Get a list of reusable CPUs (e.g. CPUs reused from initContainers).
|
// Get a list of reusable CPUs (e.g. CPUs reused from initContainers).
|
||||||
// It should be an empty CPUSet for a newly created pod.
|
// It should be an empty CPUSet for a newly created pod.
|
||||||
|
Loading…
Reference in New Issue
Block a user