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

Fix a race in the integration tests.

Browse Source
This commit is contained in:
Prashanth Balasubramanian 2015-04-08 09:53:24 -07:00
parent 24b478dd0a
commit 62984f9bee
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/integration/integration.go
View File

@ -258,9 +258,15 @@ func makeTempDirOrDie(prefix string, baseDir string) string {
} }
// podsOnMinions returns true when all of the selected pods exist on a minion. // podsOnMinions returns true when all of the selected pods exist on a minion.
func podsOnMinions(c *client.Client, pods api.PodList) wait.ConditionFunc { func podsOnMinions(c *client.Client, podNamespace string, labelSelector labels.Selector) wait.ConditionFunc {
podInfo := fakeKubeletClient{} podInfo := fakeKubeletClient{}
// wait for minions to indicate they have info about the desired pods
return func() (bool, error) { return func() (bool, error) {
pods, err := c.Pods(podNamespace).List(labelSelector)
if err != nil {
glog.Infof("Unable to get pods to list: %v", err)
return false, nil
}
for i := range pods.Items { for i := range pods.Items {
host, id, namespace := pods.Items[i].Spec.Host, pods.Items[i].Name, pods.Items[i].Namespace host, id, namespace := pods.Items[i].Spec.Host, pods.Items[i].Name, pods.Items[i].Namespace
glog.Infof("Check whether pod %s.%s exists on node %q", id, namespace, host) glog.Infof("Check whether pod %s.%s exists on node %q", id, namespace, host)
@ -426,12 +432,13 @@ func runReplicationControllerTest(c *client.Client) {
glog.Fatalf("FAILED: pods never created %v", err) glog.Fatalf("FAILED: pods never created %v", err)
} }
// wait for minions to indicate they have info about the desired pods // Poll till we can retrieve the status of all pods matching the given label selector from their minions.
pods, err := c.Pods("test").List(labels.Set(updated.Spec.Selector).AsSelector()) // This involves 3 operations:
if err != nil { // - The scheduler must assign all pods to a minion
glog.Fatalf("FAILED: unable to get pods to list: %v", err) // - The assignment must reflect in a `List` operation against the apiserver, for labels matching the selector
} // - We need to be able to query the kubelet on that minion for information about the pod
if err := wait.Poll(time.Second, time.Second*30, podsOnMinions(c, *pods)); err != nil { if err := wait.Poll(
time.Second, time.Second*30, podsOnMinions(c, "test", labels.Set(updated.Spec.Selector).AsSelector())); err != nil {
glog.Fatalf("FAILED: pods never started running %v", err) glog.Fatalf("FAILED: pods never started running %v", err)
} }