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

ReservedMemory Configuration for NUMA

Browse Source 
Kubelet throws error when multiple numa nodes are specified for memory
reservation. This is due to "," being used as separator for different
memory types within same numa node as well as for different numa nodes.

This PR fixes the error by using ";" as the separator for
specifying multiple numa node configuration.

Signed-off-by: Ravindra Thakur <ravindra.nath.thakur@est.tech>
This commit is contained in:
Ravindra Thakur 2021-12-14 11:42:05 +05:30
parent 77243f3274
commit a1f73cc247
2 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pkg/util/flag/flags.go
View File

@ -188,47 +188,46 @@ func (v *ReservedMemoryVar) Set(s string) error {
return nil
}
numaNodeReservation := strings.Split(s, ":")
if len(numaNodeReservation) != 2 {
return fmt.Errorf("the reserved memory has incorrect format, expected numaNodeID:type=quantity[,type=quantity...], got %s", s)
}
memoryTypeReservations := strings.Split(numaNodeReservation[1], ",")
if len(memoryTypeReservations) < 1 {
return fmt.Errorf("the reserved memory has incorrect format, expected numaNodeID:type=quantity[,type=quantity...], got %s", s)
}
numaNodeID, err := strconv.Atoi(numaNodeReservation[0])
if err != nil {
return fmt.Errorf("failed to convert the NUMA node ID, exptected integer, got %s", numaNodeReservation[0])
}
memoryReservation := kubeletconfig.MemoryReservation{
NumaNode: int32(numaNodeID),
Limits: map[v1.ResourceName]resource.Quantity{},
}
for _, reservation := range memoryTypeReservations {
limit := strings.Split(reservation, "=")
if len(limit) != 2 {
return fmt.Errorf("the reserved limit has incorrect value, expected type=quantatity, got %s", reservation)
numaNodeReservations := strings.Split(s, ";")
for _, reservation := range numaNodeReservations {
numaNodeReservation := strings.Split(reservation, ":")
if len(numaNodeReservation) != 2 {
return fmt.Errorf("the reserved memory has incorrect format, expected numaNodeID:type=quantity[,type=quantity...], got %s", reservation)
}
resourceName := v1.ResourceName(limit[0])
if resourceName != v1.ResourceMemory && !corev1helper.IsHugePageResourceName(resourceName) {
return fmt.Errorf("memory type conversion error, unknown type: %q", resourceName)
memoryTypeReservations := strings.Split(numaNodeReservation[1], ",")
if len(memoryTypeReservations) < 1 {
return fmt.Errorf("the reserved memory has incorrect format, expected numaNodeID:type=quantity[,type=quantity...], got %s", reservation)
}
q, err := resource.ParseQuantity(limit[1])
numaNodeID, err := strconv.Atoi(numaNodeReservation[0])
if err != nil {
return fmt.Errorf("failed to parse the quantatity, expected quantatity, got %s", limit[1])
return fmt.Errorf("failed to convert the NUMA node ID, exptected integer, got %s", numaNodeReservation[0])
}
memoryReservation.Limits[v1.ResourceName(limit[0])] = q
memoryReservation := kubeletconfig.MemoryReservation{
NumaNode: int32(numaNodeID),
Limits: map[v1.ResourceName]resource.Quantity{},
}
for _, memoryTypeReservation := range memoryTypeReservations {
limit := strings.Split(memoryTypeReservation, "=")
if len(limit) != 2 {
return fmt.Errorf("the reserved limit has incorrect value, expected type=quantatity, got %s", memoryTypeReservation)
}
resourceName := v1.ResourceName(limit[0])
if resourceName != v1.ResourceMemory && !corev1helper.IsHugePageResourceName(resourceName) {
return fmt.Errorf("memory type conversion error, unknown type: %q", resourceName)
}
q, err := resource.ParseQuantity(limit[1])
if err != nil {
return fmt.Errorf("failed to parse the quantatity, expected quantatity, got %s", limit[1])
}
memoryReservation.Limits[v1.ResourceName(limit[0])] = q
}
*v.Value = append(*v.Value, memoryReservation)
}
*v.Value = append(*v.Value, memoryReservation)
return nil
}

19
pkg/util/flag/flags_test.go
View File

@ -224,6 +224,25 @@ func TestReservedMemoryVar(t *testing.T) {
},
},
},
{
desc: "valid input with ';' as separator for multiple reserved-memory arguments",
argc: "blah --reserved-memory=0:memory=1Gi,hugepages-1Gi=1Gi;1:memory=1Gi",
expectVal: []kubeletconfig.MemoryReservation{
{
NumaNode: 0,
Limits: v1.ResourceList{
v1.ResourceMemory: memory1Gi,
resourceNameHugepages1Gi: memory1Gi,
},
},
{
NumaNode: 1,
Limits: v1.ResourceList{
v1.ResourceMemory: memory1Gi,
},
},
},
},
{
desc: "invalid input",
argc: "blah --reserved-memory=bad-input",