mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #99464 from Nordix/master-fix
Number of sockets is assumed to be same as NUMA nodes in kubelet
This commit is contained in:
commit
ef44d39be0
@ -245,7 +245,7 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) {
|
||||
|
||||
return &CPUTopology{
|
||||
NumCPUs: machineInfo.NumCores,
|
||||
NumSockets: len(machineInfo.Topology),
|
||||
NumSockets: machineInfo.NumSockets,
|
||||
NumCores: numPhysicalCores,
|
||||
CPUDetails: CPUDetails,
|
||||
}, nil
|
||||
|
@ -42,7 +42,8 @@ func Test_Discover(t *testing.T) {
|
||||
{
|
||||
name: "OneSocketHT",
|
||||
machineInfo: cadvisorapi.MachineInfo{
|
||||
NumCores: 8,
|
||||
NumCores: 8,
|
||||
NumSockets: 1,
|
||||
Topology: []cadvisorapi.Node{
|
||||
{Id: 0,
|
||||
Cores: []cadvisorapi.Core{
|
||||
@ -74,7 +75,8 @@ func Test_Discover(t *testing.T) {
|
||||
{
|
||||
name: "DualSocketNoHT",
|
||||
machineInfo: cadvisorapi.MachineInfo{
|
||||
NumCores: 4,
|
||||
NumCores: 4,
|
||||
NumSockets: 2,
|
||||
Topology: []cadvisorapi.Node{
|
||||
{Id: 0,
|
||||
Cores: []cadvisorapi.Core{
|
||||
@ -106,7 +108,8 @@ func Test_Discover(t *testing.T) {
|
||||
{
|
||||
name: "DualSocketHT - non unique Core'ID's",
|
||||
machineInfo: cadvisorapi.MachineInfo{
|
||||
NumCores: 12,
|
||||
NumCores: 12,
|
||||
NumSockets: 2,
|
||||
Topology: []cadvisorapi.Node{
|
||||
{Id: 0,
|
||||
Cores: []cadvisorapi.Core{
|
||||
@ -148,7 +151,8 @@ func Test_Discover(t *testing.T) {
|
||||
{
|
||||
name: "OneSocketHT fail",
|
||||
machineInfo: cadvisorapi.MachineInfo{
|
||||
NumCores: 8,
|
||||
NumCores: 8,
|
||||
NumSockets: 1,
|
||||
Topology: []cadvisorapi.Node{
|
||||
{Id: 0,
|
||||
Cores: []cadvisorapi.Core{
|
||||
@ -166,7 +170,8 @@ func Test_Discover(t *testing.T) {
|
||||
{
|
||||
name: "OneSocketHT fail",
|
||||
machineInfo: cadvisorapi.MachineInfo{
|
||||
NumCores: 8,
|
||||
NumCores: 8,
|
||||
NumSockets: 1,
|
||||
Topology: []cadvisorapi.Node{
|
||||
{Id: 0,
|
||||
Cores: []cadvisorapi.Core{
|
||||
|
Loading…
Reference in New Issue
Block a user