From c65d7b082cd4acc0d03f2d197e67a6eaa4095d4c Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Mon, 29 Feb 2016 13:34:14 -0800 Subject: [PATCH 1/2] Move verifyPods to e2e test util --- test/e2e/resize_nodes.go | 59 ---------------------------------------- test/e2e/util.go | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index e839c0ee85a..2aa7c8f5e6d 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -239,65 +239,6 @@ func resizeRC(c *client.Client, ns, name string, replicas int) error { return err } -func podsCreated(c *client.Client, ns, name string, replicas int) (*api.PodList, error) { - timeout := 2 * time.Minute - // List the pods, making sure we observe all the replicas. - label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) - for start := time.Now(); time.Since(start) < timeout; time.Sleep(5 * time.Second) { - options := api.ListOptions{LabelSelector: label} - pods, err := c.Pods(ns).List(options) - if err != nil { - return nil, err - } - - created := []api.Pod{} - for _, pod := range pods.Items { - if pod.DeletionTimestamp != nil { - continue - } - created = append(created, pod) - } - Logf("Pod name %s: Found %d pods out of %d", name, len(created), replicas) - - if len(created) == replicas { - pods.Items = created - return pods, nil - } - } - return nil, fmt.Errorf("Pod name %s: Gave up waiting %v for %d pods to come up", name, timeout, replicas) -} - -func podsRunning(c *client.Client, pods *api.PodList) []error { - // Wait for the pods to enter the running state. Waiting loops until the pods - // are running so non-running pods cause a timeout for this test. - By("ensuring each pod is running") - e := []error{} - for _, pod := range pods.Items { - // TODO: make waiting parallel. - err := waitForPodRunningInNamespace(c, pod.Name, pod.Namespace) - if err != nil { - e = append(e, err) - } - } - return e -} - -func verifyPods(c *client.Client, ns, name string, wantName bool, replicas int) error { - pods, err := podsCreated(c, ns, name, replicas) - if err != nil { - return err - } - e := podsRunning(c, pods) - if len(e) > 0 { - return fmt.Errorf("failed to wait for pods running: %v", e) - } - err = podsResponding(c, ns, name, wantName, pods) - if err != nil { - return fmt.Errorf("failed to wait for pods responding: %v", err) - } - return nil -} - func getMaster(c *client.Client) string { master := "" switch testContext.Provider { diff --git a/test/e2e/util.go b/test/e2e/util.go index fb1dce42076..fc69ed6cf1f 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -1158,6 +1158,65 @@ func podsResponding(c *client.Client, ns, name string, wantName bool, pods *api. return wait.PollImmediate(poll, podRespondingTimeout, podProxyResponseChecker{c, ns, label, name, wantName, pods}.checkAllResponses) } +func podsCreated(c *client.Client, ns, name string, replicas int) (*api.PodList, error) { + timeout := 2 * time.Minute + // List the pods, making sure we observe all the replicas. + label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) + for start := time.Now(); time.Since(start) < timeout; time.Sleep(5 * time.Second) { + options := api.ListOptions{LabelSelector: label} + pods, err := c.Pods(ns).List(options) + if err != nil { + return nil, err + } + + created := []api.Pod{} + for _, pod := range pods.Items { + if pod.DeletionTimestamp != nil { + continue + } + created = append(created, pod) + } + Logf("Pod name %s: Found %d pods out of %d", name, len(created), replicas) + + if len(created) == replicas { + pods.Items = created + return pods, nil + } + } + return nil, fmt.Errorf("Pod name %s: Gave up waiting %v for %d pods to come up", name, timeout, replicas) +} + +func podsRunning(c *client.Client, pods *api.PodList) []error { + // Wait for the pods to enter the running state. Waiting loops until the pods + // are running so non-running pods cause a timeout for this test. + By("ensuring each pod is running") + e := []error{} + for _, pod := range pods.Items { + // TODO: make waiting parallel. + err := waitForPodRunningInNamespace(c, pod.Name, pod.Namespace) + if err != nil { + e = append(e, err) + } + } + return e +} + +func verifyPods(c *client.Client, ns, name string, wantName bool, replicas int) error { + pods, err := podsCreated(c, ns, name, replicas) + if err != nil { + return err + } + e := podsRunning(c, pods) + if len(e) > 0 { + return fmt.Errorf("failed to wait for pods running: %v", e) + } + err = podsResponding(c, ns, name, wantName, pods) + if err != nil { + return fmt.Errorf("failed to wait for pods responding: %v", err) + } + return nil +} + func serviceResponding(c *client.Client, ns, name string) error { By(fmt.Sprintf("trying to dial the service %s.%s via the proxy", ns, name)) From f129d972620bd335e46463d489d6454a7bcd6dd3 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Mon, 29 Feb 2016 14:26:19 -0800 Subject: [PATCH 2/2] Fill missing arg in log --- pkg/controller/deployment/deployment_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 67af6ccae9c..c0638eebb53 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -743,7 +743,7 @@ func setNewReplicaSetAnnotations(deployment *extensions.Deployment, rs *extensio if rs.Annotations[deploymentutil.RevisionAnnotation] != newRevision { rs.Annotations[deploymentutil.RevisionAnnotation] = newRevision annotationChanged = true - glog.V(4).Infof("updating replica set %q's revision to %s - %+v\n", rs.Name, newRevision) + glog.V(4).Infof("updating replica set %q's revision to %s - %+v\n", rs.Name, newRevision, rs) } return annotationChanged }