fixup! Add numa cpuset support

Signed-off-by: xibz <[email protected]>

Author: xibz

runtime/cpuset/cpuset_builder.go

@@ -15,10 +15,38 @@ package cpuset
 
 import (
 	"fmt"
+	"strings"
 )
 
-// Builder will allow building of cpuset fields
-// http://man7.org/linux/man-pages/man7/cpuset.7.html
+// Builder will allow building of cpuset fields such as cpuset.cpus and
+// cpuset.mems
+//
+// Example:
+//	cset := cpuset.Builder{}.
+//		AddCPU(0).
+//		AddMemRange(0).
+//		Build()
+//
+//	fcClient, err := fcclient.New(containerdTTRPCAddress)
+//	if err != nil {
+//		return err
+//	}
+//
+//	defer fcClient.Close()
+//
+//	vmID := "cpuset-builder-example"
+//	createVMRequest := &proto.CreateVMRequest{
+//		VMID: vmID,
+//		JailerConfig: proto.JailerConfig{
+//			CPUs: cset.CPUs(),
+//			Mems: cset.Mems(),
+//		},
+//	}
+//
+//	_, err = fcClient.CreateVM(ctx, createVMRequest)
+//	if err != nil {
+//		return errors.Wrap(err, "failed to create VM")
+//	}
 type Builder struct {
 	cpus      []int
 	cpuRanges []_range
@@ -34,6 +62,8 @@ type _range struct {
 // CPUSet represents the linux CPUSet which is a series of configurable values
 // that allow processes to run on a specific CPUs and those CPUs are then bound
 // to the memory nodes specified.
+//
+// More information can be found here: http://man7.org/linux/man-pages/man7/cpuset.7.html
 type CPUSet struct {
 	cpus string
 	mems string
@@ -67,14 +97,13 @@ func (b Builder) AddCPURange(min, max int) Builder {
 	return b
 }
 
-// AddMem adds a memory node which limit where the cpus can allocate memory
+// AddMem adds a memory node which limits where the cpus can allocate memory
 func (b Builder) AddMem(mem int) Builder {
 	b.mems = append(b.mems, mem)
 	return b
 }
 
-// AddMemRange adds a range of memory nodes by utilizing the minimum node to
-// use to the maximum node to use.
+// AddMemRange adds a range of memory nodes to be used.
 func (b Builder) AddMemRange(min, max int) Builder {
 	b.memRanges = append(b.memRanges, _range{
 		min: min,
@@ -96,24 +125,14 @@ func (b Builder) Build() CPUSet {
 }
 
 func stringify(elems []int, ranges []_range) string {
-	str := ""
+	strs := []string{}
 	for _, elem := range elems {
-		sep := ","
-		if len(str) == 0 {
-			sep = ""
-		}
-
-		str += fmt.Sprintf("%s%d", sep, elem)
+		strs = append(strs, fmt.Sprintf("%d", elem))
 	}
 
 	for _, r := range ranges {
-		sep := ","
-		if len(str) == 0 {
-			sep = ""
-		}
-
-		str += fmt.Sprintf("%s%d-%d", sep, r.min, r.max)
+		strs = append(strs, fmt.Sprintf("%d-%d", r.min, r.max))
 	}
 
-	return str
+	return strings.Join(strs, ",")
 }

runtime/cpuset/cpuset_builder_test.go

@@ -28,6 +28,9 @@ func TestCPUSet(t *testing.T) {
 		memRanges      []_range
 		expectedCPUSet CPUSet
 	}{
+		{
+			name: "empty set",
+		},
 		{
 			name: "single cpu only",
 			cpus: []int{0},

runtime/jailer_integ_test.go

@@ -81,7 +81,7 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
 	}()
 }
 
-func TestJailerWithNumaNode_Isolated(t *testing.T) {
+func TestJailerCPUSet_Isolated(t *testing.T) {
 	prepareIntegTest(t, withJailer())
 
 	t.Run("Jailer NumaNode", func(t *testing.T) {