scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18783 from freehan/eslogging

Browse Source 
increase grace period for elasticsearch cluster to complete master election
This commit is contained in:
Minhan Xia
2015-12-17 17:31:08 -08:00
parent 7ec24ffaab c0e9612300
commit cbcb3c040e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/es_cluster_logging.go
View File

@@ -72,7 +72,7 @@ func nodeInNodeList(nodeName string, nodeList *api.NodeList) bool {
// ClusterLevelLoggingWithElasticsearch is an end to end test for cluster level logging. // ClusterLevelLoggingWithElasticsearch is an end to end test for cluster level logging.
func ClusterLevelLoggingWithElasticsearch(f *Framework) { func ClusterLevelLoggingWithElasticsearch(f *Framework) {
// graceTime is how long to keep retrying requests for status information. // graceTime is how long to keep retrying requests for status information.
const graceTime = 2 * time.Minute const graceTime = 5 * time.Minute
// ingestionTimeout is how long to keep retrying to wait for all the // ingestionTimeout is how long to keep retrying to wait for all the
// logs to be ingested. // logs to be ingested.
const ingestionTimeout = 3 * time.Minute const ingestionTimeout = 3 * time.Minute
@@ -108,7 +108,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
var esResponse map[string]interface{} var esResponse map[string]interface{}
err = nil err = nil
var body []byte var body []byte
for start := time.Now(); time.Since(start) < graceTime; time.Sleep(5 * time.Second) { for start := time.Now(); time.Since(start) < graceTime; time.Sleep(10 * time.Second) {
// Query against the root URL for Elasticsearch. // Query against the root URL for Elasticsearch.
body, err = f.Client.Get(). body, err = f.Client.Get().
Namespace(api.NamespaceSystem). Namespace(api.NamespaceSystem).
@@ -136,6 +136,10 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
Logf("After %v expected status to be a float64 but got %v of type %T", time.Since(start), statusIntf, statusIntf) Logf("After %v expected status to be a float64 but got %v of type %T", time.Since(start), statusIntf, statusIntf)
continue continue
} }
if int(statusCode) != 200 {
Logf("After %v Elasticsearch cluster has a bad status: %v", time.Since(start), statusCode)
continue
}
break break
} }
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())