github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99464 from Nordix/master-fix

Browse Source 
Number of sockets is assumed to be same as NUMA nodes in kubelet
This commit is contained in:
Kubernetes Prow Robot 2021-03-03 14:41:21 -08:00 committed by GitHub
commit ef44d39be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/cpumanager/topology/topology.go
View File

@ -245,7 +245,7 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) {
return &CPUTopology{ return &CPUTopology{
NumCPUs: machineInfo.NumCores, NumCPUs: machineInfo.NumCores,
NumSockets: len(machineInfo.Topology), NumSockets: machineInfo.NumSockets,
NumCores: numPhysicalCores, NumCores: numPhysicalCores,
CPUDetails: CPUDetails, CPUDetails: CPUDetails,
}, nil }, nil

15
pkg/kubelet/cm/cpumanager/topology/topology_test.go
View File

@ -42,7 +42,8 @@ func Test_Discover(t *testing.T) {
{ {
name: "OneSocketHT", name: "OneSocketHT",
machineInfo: cadvisorapi.MachineInfo{ machineInfo: cadvisorapi.MachineInfo{
NumCores: 8, NumCores: 8,
NumSockets: 1,
Topology: []cadvisorapi.Node{ Topology: []cadvisorapi.Node{
{Id: 0, {Id: 0,
Cores: []cadvisorapi.Core{ Cores: []cadvisorapi.Core{
@ -74,7 +75,8 @@ func Test_Discover(t *testing.T) {
{ {
name: "DualSocketNoHT", name: "DualSocketNoHT",
machineInfo: cadvisorapi.MachineInfo{ machineInfo: cadvisorapi.MachineInfo{
NumCores: 4, NumCores: 4,
NumSockets: 2,
Topology: []cadvisorapi.Node{ Topology: []cadvisorapi.Node{
{Id: 0, {Id: 0,
Cores: []cadvisorapi.Core{ Cores: []cadvisorapi.Core{
@ -106,7 +108,8 @@ func Test_Discover(t *testing.T) {
{ {
name: "DualSocketHT - non unique Core'ID's", name: "DualSocketHT - non unique Core'ID's",
machineInfo: cadvisorapi.MachineInfo{ machineInfo: cadvisorapi.MachineInfo{
NumCores: 12, NumCores: 12,
NumSockets: 2,
Topology: []cadvisorapi.Node{ Topology: []cadvisorapi.Node{
{Id: 0, {Id: 0,
Cores: []cadvisorapi.Core{ Cores: []cadvisorapi.Core{
@ -148,7 +151,8 @@ func Test_Discover(t *testing.T) {
{ {
name: "OneSocketHT fail", name: "OneSocketHT fail",
machineInfo: cadvisorapi.MachineInfo{ machineInfo: cadvisorapi.MachineInfo{
NumCores: 8, NumCores: 8,
NumSockets: 1,
Topology: []cadvisorapi.Node{ Topology: []cadvisorapi.Node{
{Id: 0, {Id: 0,
Cores: []cadvisorapi.Core{ Cores: []cadvisorapi.Core{
@ -166,7 +170,8 @@ func Test_Discover(t *testing.T) {
{ {
name: "OneSocketHT fail", name: "OneSocketHT fail",
machineInfo: cadvisorapi.MachineInfo{ machineInfo: cadvisorapi.MachineInfo{
NumCores: 8, NumCores: 8,
NumSockets: 1,
Topology: []cadvisorapi.Node{ Topology: []cadvisorapi.Node{
{Id: 0, {Id: 0,
Cores: []cadvisorapi.Core{ Cores: []cadvisorapi.Core{