From 3fbde5ecfb28decd3484fffd48add84aab417820 Mon Sep 17 00:00:00 2001 From: Mik Vyatskov Date: Wed, 21 Sep 2016 13:55:43 +0200 Subject: [PATCH] Fixed elasticsearch cluster logging e2e test on GCI --- cluster/addons/fluentd-elasticsearch/es-controller.yaml | 4 ++-- test/e2e/es_cluster_logging.go | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml index c875984e10..b4f209485e 100644 --- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml @@ -23,9 +23,9 @@ spec: - image: gcr.io/google_containers/elasticsearch:1.9 name: elasticsearch-logging resources: - # keep request = limit to keep this container in guaranteed class + # need more cpu upon initialization, therefore burstable class limits: - cpu: 100m + cpu: 1000m requests: cpu: 100m ports: diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index 53eace6ba5..3f6d637f7e 100644 --- a/test/e2e/es_cluster_logging.go +++ b/test/e2e/es_cluster_logging.go @@ -219,11 +219,6 @@ func ClusterLevelLoggingWithElasticsearch(f *framework.Framework) { } framework.Logf("Found %d healthy nodes.", len(nodes.Items)) - // TODO: Figure out why initialization time influences - // results of the test and remove this step - By("Wait some more time to ensure ES and fluentd are ready") - time.Sleep(2 * time.Minute) - // Wait for the Fluentd pods to enter the running state. By("Checking to make sure the Fluentd pod are running on each healthy node") label = labels.SelectorFromSet(labels.Set(map[string]string{k8sAppKey: fluentdValue})) @@ -306,9 +301,6 @@ func ClusterLevelLoggingWithElasticsearch(f *framework.Framework) { Expect(err).NotTo(HaveOccurred()) } - // Wait a bit for the log information to make it into Elasticsearch. - time.Sleep(30 * time.Second) - // Make several attempts to observe the logs ingested into Elasticsearch. By("Checking all the log lines were ingested into Elasticsearch") totalMissing := 0