github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34699 from Crassirostris/es-logging-test-fix

Browse Source 
Automatic merge from submit-queue

Fix ES cluster logging test

@piosz 

Fixes flakiness of ES cluster logging test.

Fix #34666
This commit is contained in:
Kubernetes Submit Queue 2016-10-13 04:19:13 -07:00 committed by GitHub
commit aa485ce82c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/cluster_logging_es.go
View File

@ -218,17 +218,16 @@ func getMissingLinesCountElasticsearch(f *framework.Framework, expectedCount int
return 0, fmt.Errorf("Failed to get services proxy request: %v", errProxy) return 0, fmt.Errorf("Failed to get services proxy request: %v", errProxy)
} }
// Ask Elasticsearch to return all the log lines that were tagged with the underscore // Ask Elasticsearch to return all the log lines that were tagged with the
// version of the name. Ask for twice as many log lines as we expect to check for // pod name. Ask for ten times as many log lines because duplication is possible.
// duplication bugs.
body, err := proxyRequest.Namespace(api.NamespaceSystem). body, err := proxyRequest.Namespace(api.NamespaceSystem).
Name("elasticsearch-logging"). Name("elasticsearch-logging").
Suffix("_search"). Suffix("_search").
// TODO: Change filter to only match records from current test run // TODO: Change filter to only match records from current test run
// after fluent-plugin-kubernetes_metadata_filter is enabled // after fluent-plugin-kubernetes_metadata_filter is enabled
// and optimize current query // and optimize current query
Param("q", "tag:*synthlogger*"). Param("q", fmt.Sprintf("tag:*%s*", synthLoggerPodName)).
Param("size", strconv.Itoa(expectedCount)). Param("size", strconv.Itoa(expectedCount*10)).
DoRaw() DoRaw()
if err != nil { if err != nil {
return 0, fmt.Errorf("Failed to make proxy call to elasticsearch-logging: %v", err) return 0, fmt.Errorf("Failed to make proxy call to elasticsearch-logging: %v", err)