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

fix flaky allocatable test

Browse Source
This commit is contained in:
David Ashpole 2017-11-16 11:16:58 -08:00
parent a3bfe65d86
commit 8f3e2f315e
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
test/e2e_node/node_container_manager_test.go
View File

@ -25,6 +25,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
@ -34,6 +35,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
) )
func setDesiredConfiguration(initialConfig *kubeletconfig.KubeletConfiguration) { func setDesiredConfiguration(initialConfig *kubeletconfig.KubeletConfiguration) {
@ -176,41 +178,45 @@ func runTest(f *framework.Framework) error {
return fmt.Errorf("Expected Node Allocatable Cgroup Does not exist") return fmt.Errorf("Expected Node Allocatable Cgroup Does not exist")
} }
// TODO: Update cgroupManager to expose a Status interface to get current Cgroup Settings. // TODO: Update cgroupManager to expose a Status interface to get current Cgroup Settings.
nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{}) // The node may not have updated capacity and allocatable yet, so check that it happens eventually.
if err != nil { Eventually(func() error {
return err nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{})
} if err != nil {
if len(nodeList.Items) != 1 { return err
return fmt.Errorf("Unexpected number of node objects for node e2e. Expects only one node: %+v", nodeList) }
} if len(nodeList.Items) != 1 {
node := nodeList.Items[0] return fmt.Errorf("Unexpected number of node objects for node e2e. Expects only one node: %+v", nodeList)
capacity := node.Status.Capacity }
allocatableCPU, allocatableMemory := getAllocatableLimits("200m", "200Mi", capacity) node := nodeList.Items[0]
// Total Memory reservation is 200Mi excluding eviction thresholds. capacity := node.Status.Capacity
// Expect CPU shares on node allocatable cgroup to equal allocatable. allocatableCPU, allocatableMemory := getAllocatableLimits("200m", "200Mi", capacity)
if err := expectFileValToEqual(filepath.Join(subsystems.MountPoints["cpu"], "kubepods", "cpu.shares"), int64(cm.MilliCPUToShares(allocatableCPU.MilliValue())), 10); err != nil { // Total Memory reservation is 200Mi excluding eviction thresholds.
return err // Expect CPU shares on node allocatable cgroup to equal allocatable.
} if err := expectFileValToEqual(filepath.Join(subsystems.MountPoints["cpu"], "kubepods", "cpu.shares"), int64(cm.MilliCPUToShares(allocatableCPU.MilliValue())), 10); err != nil {
// Expect Memory limit on node allocatable cgroup to equal allocatable. return err
if err := expectFileValToEqual(filepath.Join(subsystems.MountPoints["memory"], "kubepods", "memory.limit_in_bytes"), allocatableMemory.Value(), 0); err != nil { }
return err // Expect Memory limit on node allocatable cgroup to equal allocatable.
} if err := expectFileValToEqual(filepath.Join(subsystems.MountPoints["memory"], "kubepods", "memory.limit_in_bytes"), allocatableMemory.Value(), 0); err != nil {
return err
}
// Check that Allocatable reported to scheduler includes eviction thresholds. // Check that Allocatable reported to scheduler includes eviction thresholds.
schedulerAllocatable := node.Status.Allocatable schedulerAllocatable := node.Status.Allocatable
// Memory allocatable should take into account eviction thresholds. // Memory allocatable should take into account eviction thresholds.
allocatableCPU, allocatableMemory = getAllocatableLimits("200m", "300Mi", capacity) allocatableCPU, allocatableMemory = getAllocatableLimits("200m", "300Mi", capacity)
// Expect allocatable to include all resources in capacity. // Expect allocatable to include all resources in capacity.
if len(schedulerAllocatable) != len(capacity) { if len(schedulerAllocatable) != len(capacity) {
return fmt.Errorf("Expected all resources in capacity to be found in allocatable") return fmt.Errorf("Expected all resources in capacity to be found in allocatable")
} }
// CPU based evictions are not supported. // CPU based evictions are not supported.
if allocatableCPU.Cmp(schedulerAllocatable[v1.ResourceCPU]) != 0 { if allocatableCPU.Cmp(schedulerAllocatable[v1.ResourceCPU]) != 0 {
return fmt.Errorf("Unexpected cpu allocatable value exposed by the node. Expected: %v, got: %v, capacity: %v", allocatableCPU, schedulerAllocatable[v1.ResourceCPU], capacity[v1.ResourceCPU]) return fmt.Errorf("Unexpected cpu allocatable value exposed by the node. Expected: %v, got: %v, capacity: %v", allocatableCPU, schedulerAllocatable[v1.ResourceCPU], capacity[v1.ResourceCPU])
} }
if allocatableMemory.Cmp(schedulerAllocatable[v1.ResourceMemory]) != 0 { if allocatableMemory.Cmp(schedulerAllocatable[v1.ResourceMemory]) != 0 {
return fmt.Errorf("Unexpected cpu allocatable value exposed by the node. Expected: %v, got: %v, capacity: %v", allocatableCPU, schedulerAllocatable[v1.ResourceCPU], capacity[v1.ResourceMemory]) return fmt.Errorf("Unexpected memory allocatable value exposed by the node. Expected: %v, got: %v, capacity: %v", allocatableMemory, schedulerAllocatable[v1.ResourceMemory], capacity[v1.ResourceMemory])
} }
return nil
}, time.Minute, 5*time.Second).Should(BeNil())
if !cgroupManager.Exists(cm.CgroupName(kubeReservedCgroup)) { if !cgroupManager.Exists(cm.CgroupName(kubeReservedCgroup)) {
return fmt.Errorf("Expected kube reserved cgroup Does not exist") return fmt.Errorf("Expected kube reserved cgroup Does not exist")