github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22275 from gmarek/flake

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 17:54:29 -08:00
commit 2472a176b7
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/e2e/scheduler_predicates.go
View File

@ -28,19 +28,26 @@ import (
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/system"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
_ "github.com/stretchr/testify/assert" _ "github.com/stretchr/testify/assert"
) )
// variable set in BeforeEach, never modified afterwards
var masterNodes sets.String
// Returns a number of currently scheduled and not scheduled Pods. // Returns a number of currently scheduled and not scheduled Pods.
func getPodsScheduled(pods *api.PodList) (scheduledPods, notScheduledPods []api.Pod) { func getPodsScheduled(pods *api.PodList) (scheduledPods, notScheduledPods []api.Pod) {
for _, pod := range pods.Items { for _, pod := range pods.Items {
if pod.Spec.NodeName != "" { if !masterNodes.Has(pod.Spec.NodeName) {
scheduledPods = append(scheduledPods, pod) if pod.Spec.NodeName != "" {
} else { scheduledPods = append(scheduledPods, pod)
notScheduledPods = append(notScheduledPods, pod) } else {
notScheduledPods = append(notScheduledPods, pod)
}
} }
} }
return return
@ -155,9 +162,18 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
BeforeEach(func() { BeforeEach(func() {
c = framework.Client c = framework.Client
ns = framework.Namespace.Name ns = framework.Namespace.Name
nodeList = ListSchedulableNodesOrDie(c) nodeList = &api.NodeList{}
nodes, err := c.Nodes().List(api.ListOptions{})
masterNodes = sets.NewString()
for _, node := range nodes.Items {
if system.IsMasterNode(&node) {
masterNodes.Insert(node.Name)
} else {
nodeList.Items = append(nodeList.Items, node)
}
}
err := checkTestingNSDeletedExcept(c, ns) err = checkTestingNSDeletedExcept(c, ns)
expectNoError(err) expectNoError(err)
// Every test case in this suite assumes that cluster add-on pods stay stable and // Every test case in this suite assumes that cluster add-on pods stay stable and
@ -165,7 +181,12 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
// It is so because we need to have precise control on what's running in the cluster. // It is so because we need to have precise control on what's running in the cluster.
systemPods, err := c.Pods(api.NamespaceSystem).List(api.ListOptions{}) systemPods, err := c.Pods(api.NamespaceSystem).List(api.ListOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
systemPodsNo = len(systemPods.Items) systemPodsNo = 0
for _, pod := range systemPods.Items {
if !masterNodes.Has(pod.Spec.NodeName) && pod.DeletionTimestamp == nil {
systemPodsNo++
}
}
err = waitForPodsRunningReady(api.NamespaceSystem, systemPodsNo, podReadyBeforeTimeout) err = waitForPodsRunningReady(api.NamespaceSystem, systemPodsNo, podReadyBeforeTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -186,10 +207,10 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
totalPodCapacity = 0 totalPodCapacity = 0
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
Logf("Node: %v", node)
podCapacity, found := node.Status.Capacity["pods"] podCapacity, found := node.Status.Capacity["pods"]
Expect(found).To(Equal(true)) Expect(found).To(Equal(true))
totalPodCapacity += podCapacity.Value() totalPodCapacity += podCapacity.Value()
Logf("Node: %v", node)
} }
currentlyScheduledPods := waitForStableCluster(c) currentlyScheduledPods := waitForStableCluster(c)
@ -259,8 +280,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
expectNoError(err) expectNoError(err)
for _, pod := range pods.Items { for _, pod := range pods.Items {
_, found := nodeToCapacityMap[pod.Spec.NodeName] _, found := nodeToCapacityMap[pod.Spec.NodeName]
Expect(found).To(Equal(true)) if found && pod.Status.Phase == api.PodRunning {
if pod.Status.Phase == api.PodRunning {
Logf("Pod %v requesting resource %v on Node %v", pod.Name, getRequestedCPU(pod), pod.Spec.NodeName) Logf("Pod %v requesting resource %v on Node %v", pod.Name, getRequestedCPU(pod), pod.Spec.NodeName)
nodeToCapacityMap[pod.Spec.NodeName] -= getRequestedCPU(pod) nodeToCapacityMap[pod.Spec.NodeName] -= getRequestedCPU(pod)
} }

1
test/e2e/util.go
View File

@ -1967,6 +1967,7 @@ func startPods(c *client.Client, replicas int, namespace string, podNamePrefix s
_, err := c.Pods(namespace).Create(&pod) _, err := c.Pods(namespace).Create(&pod)
expectNoError(err) expectNoError(err)
} }
Logf("Waiting for running...")
if waitForRunning { if waitForRunning {
label := labels.SelectorFromSet(labels.Set(map[string]string{"startPodsID": startPodsID})) label := labels.SelectorFromSet(labels.Set(map[string]string{"startPodsID": startPodsID}))
err := waitForPodsWithLabelRunning(c, namespace, label) err := waitForPodsWithLabelRunning(c, namespace, label)