From 4c91cf20285d5da5e3c473f9824f612854bdf641 Mon Sep 17 00:00:00 2001 From: jay vyas Date: Mon, 22 Feb 2016 19:05:38 -0500 Subject: [PATCH] e2e cassandra fixes, needs follow on container update --- examples/cassandra/README.md | 4 +++- examples/cassandra/cassandra-controller.yaml | 4 +++- test/e2e/examples.go | 17 +++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/examples/cassandra/README.md b/examples/cassandra/README.md index 24567bf252e..acdaf76d934 100644 --- a/examples/cassandra/README.md +++ b/examples/cassandra/README.md @@ -196,7 +196,9 @@ metadata: app: cassandra name: cassandra spec: - replicas: 1 + replicas: 2 + selector: + app: cassandra template: metadata: labels: diff --git a/examples/cassandra/cassandra-controller.yaml b/examples/cassandra/cassandra-controller.yaml index 63ea8dbd40a..8cf34188bcf 100644 --- a/examples/cassandra/cassandra-controller.yaml +++ b/examples/cassandra/cassandra-controller.yaml @@ -5,7 +5,9 @@ metadata: app: cassandra name: cassandra spec: - replicas: 1 + replicas: 2 + selector: + app: cassandra template: metadata: labels: diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 7b33f8ebd10..81f072e01b5 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -197,31 +197,36 @@ var _ = Describe("[Feature:Example]", func() { controllerYaml := mkpath("cassandra-controller.yaml") nsFlag := fmt.Sprintf("--namespace=%v", ns) - By("starting service and pod") + By("Starting the cassandra service and pod") runKubectlOrDie("create", "-f", serviceYaml, nsFlag) runKubectlOrDie("create", "-f", podYaml, nsFlag) + + Logf("waiting for first cassandra pod") err := waitForPodRunningInNamespace(c, "cassandra", ns) Expect(err).NotTo(HaveOccurred()) + Logf("waiting for thrift listener online") _, err = lookForStringInLog(ns, "cassandra", "cassandra", "Listening for thrift clients", serverStartTimeout) Expect(err).NotTo(HaveOccurred()) + Logf("wait for service") err = waitForEndpoint(c, ns, "cassandra") Expect(err).NotTo(HaveOccurred()) - By("create and scale rc") + // Create an RC with n nodes in it. Each node will then be verified. + By("Creating a Cassandra RC") runKubectlOrDie("create", "-f", controllerYaml, nsFlag) - err = ScaleRC(c, ns, "cassandra", 2, true) - Expect(err).NotTo(HaveOccurred()) - forEachPod(c, ns, "name", "cassandra", func(pod api.Pod) { + forEachPod(c, ns, "app", "cassandra", func(pod api.Pod) { + Logf("Verifying pod %v ", pod.Name) _, err = lookForStringInLog(ns, pod.Name, "cassandra", "Listening for thrift clients", serverStartTimeout) Expect(err).NotTo(HaveOccurred()) _, err = lookForStringInLog(ns, pod.Name, "cassandra", "Handshaking version", serverStartTimeout) Expect(err).NotTo(HaveOccurred()) }) + By("Finding each node in the nodetool status lines") output := runKubectlOrDie("exec", "cassandra", nsFlag, "--", "nodetool", "status") - forEachPod(c, ns, "name", "cassandra", func(pod api.Pod) { + forEachPod(c, ns, "app", "cassandra", func(pod api.Pod) { if !strings.Contains(output, pod.Status.PodIP) { Failf("Pod ip %s not found in nodetool status", pod.Status.PodIP) }