From c109ab23f98b00ee5f98000c760985da967d47a9 Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Tue, 1 Oct 2019 00:16:00 -0600 Subject: [PATCH 3/6] kubelet cpumanager keep normal containers off reserved CPUs When starting the kubelet process, two separate sets of reserved CPUs may be specified. With this change CPUs reserved via '--system-reserved=cpu' or '--kube-reserved=cpu' will be ignored by kubernetes itself. A small tweak to the default CPU affinity ensures that "normal" Kubernetes pods won't run on the reserved CPUs. Signed-off-by: Chris Friesen --- pkg/kubelet/cm/cpumanager/cpu_manager.go | 5 +++- pkg/kubelet/cm/cpumanager/cpu_manager_test.go | 11 +++++--- pkg/kubelet/cm/cpumanager/policy_static.go | 29 ++++++++++++++++---- pkg/kubelet/cm/cpumanager/policy_static_test.go | 35 ++++++++++++++++++------- 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go index c0c440453a9..322a2040a77 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager.go @@ -161,7 +161,10 @@ func NewManager(cpuPolicyName string, reconcilePeriod time.Duration, machineInfo // exclusively allocated. reservedCPUsFloat := float64(reservedCPUs.MilliValue()) / 1000 numReservedCPUs := int(math.Ceil(reservedCPUsFloat)) - policy, err = NewStaticPolicy(topo, numReservedCPUs, specificCPUs, affinity) + // NOTE: Set excludeReserved unconditionally to exclude reserved CPUs from default cpuset. + // This variable is primarily to make testing easier. + excludeReserved := true + policy, err = NewStaticPolicy(topo, numReservedCPUs, specificCPUs, affinity, excludeReserved) if err != nil { return nil, fmt.Errorf("new static policy error: %v", err) } diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go index e9c7852c602..a4d8f13c853 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go @@ -207,6 +207,7 @@ func makeMultiContainerPod(initCPUs, appCPUs []struct{ request, limit string }) } func TestCPUManagerAdd(t *testing.T) { + testExcl := false testPolicy, _ := NewStaticPolicy( &topology.CPUTopology{ NumCPUs: 4, @@ -221,7 +222,7 @@ func TestCPUManagerAdd(t *testing.T) { }, 0, cpuset.NewCPUSet(), - topologymanager.NewFakeManager()) + topologymanager.NewFakeManager(), testExcl) testCases := []struct { description string updateErr error @@ -474,8 +475,9 @@ func TestCPUManagerAddWithInitContainers(t *testing.T) { }, } + testExcl := false for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager()) + policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager(), testExcl) state := &mockState{ assignments: testCase.stAssignments, @@ -969,6 +971,7 @@ func TestReconcileState(t *testing.T) { // above test cases are without kubelet --reserved-cpus cmd option // the following tests are with --reserved-cpus configured func TestCPUManagerAddWithResvList(t *testing.T) { + testExcl := false testPolicy, _ := NewStaticPolicy( &topology.CPUTopology{ NumCPUs: 4, @@ -983,7 +986,9 @@ func TestCPUManagerAddWithResvList(t *testing.T) { }, 1, cpuset.NewCPUSet(0), - topologymanager.NewFakeManager()) + topologymanager.NewFakeManager(), + testExcl, + ) testCases := []struct { description string updateErr error diff --git a/pkg/kubelet/cm/cpumanager/policy_static.go b/pkg/kubelet/cm/cpumanager/policy_static.go index da68ed808bd..e631d5d6a74 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static.go +++ b/pkg/kubelet/cm/cpumanager/policy_static.go @@ -75,6 +75,8 @@ type staticPolicy struct { topology *topology.CPUTopology // set of CPUs that is not available for exclusive assignment reserved cpuset.CPUSet + // If true, default CPUSet should exclude reserved CPUs + excludeReserved bool // topology manager reference to get container Topology affinity affinity topologymanager.Store } @@ -85,7 +87,7 @@ var _ Policy = &staticPolicy{} // NewStaticPolicy returns a CPU manager policy that does not change CPU // assignments for exclusively pinned guaranteed containers after the main // container process starts. -func NewStaticPolicy(topology *topology.CPUTopology, numReservedCPUs int, reservedCPUs cpuset.CPUSet, affinity topologymanager.Store) (Policy, error) { +func NewStaticPolicy(topology *topology.CPUTopology, numReservedCPUs int, reservedCPUs cpuset.CPUSet, affinity topologymanager.Store, excludeReserved bool) (Policy, error) { allCPUs := topology.CPUDetails.CPUs() var reserved cpuset.CPUSet if reservedCPUs.Size() > 0 { @@ -109,6 +111,7 @@ func NewStaticPolicy(topology *topology.CPUTopology, numReservedCPUs int, reserv return &staticPolicy{ topology: topology, reserved: reserved, + excludeReserved: excludeReserved, affinity: affinity, }, nil } @@ -136,7 +139,15 @@ func (p *staticPolicy) validateState(s state.State) error { } // state is empty initialize allCPUs := p.topology.CPUDetails.CPUs() - s.SetDefaultCPUSet(allCPUs) + if p.excludeReserved { + // Exclude reserved CPUs from the default CPUSet to keep containers off them + // unless explicitly affined. + s.SetDefaultCPUSet(allCPUs.Difference(p.reserved)) + } else { + s.SetDefaultCPUSet(allCPUs) + } + klog.Infof("[cpumanager] static policy: CPUSet: allCPUs:%v, reserved:%v, default:%v\n", + allCPUs, p.reserved, s.GetDefaultCPUSet()) return nil } @@ -144,9 +155,11 @@ func (p *staticPolicy) validateState(s state.State) error { // 1. Check if the reserved cpuset is not part of default cpuset because: // - kube/system reserved have changed (increased) - may lead to some containers not being able to start // - user tampered with file - if !p.reserved.Intersection(tmpDefaultCPUset).Equals(p.reserved) { - return fmt.Errorf("not all reserved cpus: \"%s\" are present in defaultCpuSet: \"%s\"", - p.reserved.String(), tmpDefaultCPUset.String()) + if !p.excludeReserved { + if !p.reserved.Intersection(tmpDefaultCPUset).Equals(p.reserved) { + return fmt.Errorf("not all reserved cpus: \"%s\" are present in defaultCpuSet: \"%s\"", + p.reserved.String(), tmpDefaultCPUset.String()) + } } // 2. Check if state for static policy is consistent @@ -175,6 +188,9 @@ func (p *staticPolicy) validateState(s state.State) error { } } totalKnownCPUs = totalKnownCPUs.UnionAll(tmpCPUSets) + if p.excludeReserved { + totalKnownCPUs = totalKnownCPUs.Union(p.reserved) + } if !totalKnownCPUs.Equals(p.topology.CPUDetails.CPUs()) { return fmt.Errorf("current set of available CPUs \"%s\" doesn't match with CPUs in state \"%s\"", p.topology.CPUDetails.CPUs().String(), totalKnownCPUs.String()) @@ -229,6 +245,9 @@ func (p *staticPolicy) RemoveContainer(s state.State, podUID string, containerNa klog.Infof("[cpumanager] static policy: RemoveContainer (pod: %s, container: %s)", podUID, containerName) if toRelease, ok := s.GetCPUSet(podUID, containerName); ok { s.Delete(podUID, containerName) + if p.excludeReserved { + toRelease = toRelease.Difference(p.reserved) + } // Mutate the shared pool, adding released cpus. s.SetDefaultCPUSet(s.GetDefaultCPUSet().Union(toRelease)) } diff --git a/pkg/kubelet/cm/cpumanager/policy_static_test.go b/pkg/kubelet/cm/cpumanager/policy_static_test.go index ea2bcf11333..b2982432c13 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_static_test.go @@ -33,6 +33,7 @@ type staticPolicyTest struct { description string topo *topology.CPUTopology numReservedCPUs int + excludeReserved bool podUID string containerName string stAssignments state.ContainerCPUAssignments @@ -44,7 +45,8 @@ type staticPolicyTest struct { } func TestStaticPolicyName(t *testing.T) { - policy, _ := NewStaticPolicy(topoSingleSocketHT, 1, cpuset.NewCPUSet(), topologymanager.NewFakeManager()) + testExcl := false + policy, _ := NewStaticPolicy(topoSingleSocketHT, 1, cpuset.NewCPUSet(), topologymanager.NewFakeManager(), testExcl) policyName := policy.Name() if policyName != "static" { @@ -74,6 +76,15 @@ func TestStaticPolicyStart(t *testing.T) { stDefaultCPUSet: cpuset.NewCPUSet(), expCSet: cpuset.NewCPUSet(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11), }, + { + description: "empty cpuset exclude reserved", + topo: topoDualSocketHT, + numReservedCPUs: 2, + excludeReserved: true, + stAssignments: state.ContainerCPUAssignments{}, + stDefaultCPUSet: cpuset.NewCPUSet(), + expCSet: cpuset.NewCPUSet(1, 2, 3, 4, 5, 7, 8, 9, 10, 11), + }, { description: "reserved cores 0 & 6 are not present in available cpuset", topo: topoDualSocketHT, @@ -120,7 +131,7 @@ func TestStaticPolicyStart(t *testing.T) { } for _, testCase := range testCases { t.Run(testCase.description, func(t *testing.T) { - p, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager()) + p, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager(), testCase.excludeReserved) policy := p.(*staticPolicy) st := &mockState{ assignments: testCase.stAssignments, @@ -436,7 +447,7 @@ func TestStaticPolicyAdd(t *testing.T) { } for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager()) + policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager(), testCase.excludeReserved) st := &mockState{ assignments: testCase.stAssignments, @@ -479,6 +490,7 @@ func TestStaticPolicyAdd(t *testing.T) { } func TestStaticPolicyRemove(t *testing.T) { + excludeReserved := false testCases := []staticPolicyTest{ { description: "SingleSocketHT, DeAllocOneContainer", @@ -537,7 +549,7 @@ func TestStaticPolicyRemove(t *testing.T) { } for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager()) + policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.NewCPUSet(), topologymanager.NewFakeManager(), excludeReserved) st := &mockState{ assignments: testCase.stAssignments, @@ -559,6 +571,7 @@ func TestStaticPolicyRemove(t *testing.T) { } func TestTopologyAwareAllocateCPUs(t *testing.T) { + excludeReserved := false testCases := []struct { description string topo *topology.CPUTopology @@ -627,7 +640,7 @@ func TestTopologyAwareAllocateCPUs(t *testing.T) { }, } for _, tc := range testCases { - p, _ := NewStaticPolicy(tc.topo, 0, cpuset.NewCPUSet(), topologymanager.NewFakeManager()) + p, _ := NewStaticPolicy(tc.topo, 0, cpuset.NewCPUSet(), topologymanager.NewFakeManager(), excludeReserved) policy := p.(*staticPolicy) st := &mockState{ assignments: tc.stAssignments, @@ -699,9 +712,10 @@ func TestStaticPolicyStartWithResvList(t *testing.T) { expNewErr: fmt.Errorf("[cpumanager] unable to reserve the required amount of CPUs (size of 0-1 did not equal 1)"), }, } + testExcl := false for _, testCase := range testCases { t.Run(testCase.description, func(t *testing.T) { - p, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager()) + p, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), testExcl) if !reflect.DeepEqual(err, testCase.expNewErr) { t.Errorf("StaticPolicy Start() error (%v). expected error: %v but got: %v", testCase.description, testCase.expNewErr, err) @@ -741,7 +755,7 @@ func TestStaticPolicyAddWithResvList(t *testing.T) { numReservedCPUs: 1, reserved: cpuset.NewCPUSet(0), stAssignments: state.ContainerCPUAssignments{}, - stDefaultCPUSet: cpuset.NewCPUSet(0, 1, 2, 3, 4, 5, 6, 7), + stDefaultCPUSet: cpuset.NewCPUSet(1, 2, 3, 4, 5, 6, 7), pod: makePod("fakePod", "fakeContainer2", "8000m", "8000m"), expErr: fmt.Errorf("not enough cpus available to satisfy request"), expCPUAlloc: false, @@ -753,7 +767,7 @@ func TestStaticPolicyAddWithResvList(t *testing.T) { numReservedCPUs: 2, reserved: cpuset.NewCPUSet(0, 1), stAssignments: state.ContainerCPUAssignments{}, - stDefaultCPUSet: cpuset.NewCPUSet(0, 1, 2, 3, 4, 5, 6, 7), + stDefaultCPUSet: cpuset.NewCPUSet(2, 3, 4, 5, 6, 7), pod: makePod("fakePod", "fakeContainer2", "1000m", "1000m"), expErr: nil, expCPUAlloc: true, @@ -769,7 +783,7 @@ func TestStaticPolicyAddWithResvList(t *testing.T) { "fakeContainer100": cpuset.NewCPUSet(2, 3, 6, 7), }, }, - stDefaultCPUSet: cpuset.NewCPUSet(0, 1, 4, 5), + stDefaultCPUSet: cpuset.NewCPUSet(4, 5), pod: makePod("fakePod", "fakeContainer3", "2000m", "2000m"), expErr: nil, expCPUAlloc: true, @@ -777,8 +791,9 @@ func TestStaticPolicyAddWithResvList(t *testing.T) { }, } + testExcl := true for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager()) + policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), testExcl) st := &mockState{ assignments: testCase.stAssignments, -- 2.16.6