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

do not fail when parsing unexpected log line

Browse Source
This commit is contained in:
Minhan Xia
2016-01-07 15:50:23 -08:00
parent c3d400f4bb
commit a8d913bf8b
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/es_cluster_logging.go
View File

@@ -305,7 +305,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
totalMissing := 0 totalMissing := 0
expected := nodeCount * countTo expected := nodeCount * countTo
missingPerNode := []int{} missingPerNode := []int{}
for start := time.Now(); time.Since(start) < ingestionTimeout; time.Sleep(10 * time.Second) { for start := time.Now(); time.Since(start) < ingestionTimeout; time.Sleep(25 * time.Second) {
// Debugging code to report the status of the elasticsearch logging endpoints. // Debugging code to report the status of the elasticsearch logging endpoints.
selector := labels.Set{k8sAppKey: esValue}.AsSelector() selector := labels.Set{k8sAppKey: esValue}.AsSelector()
@@ -372,33 +372,41 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
for _, e := range h { for _, e := range h {
l, ok := e.(map[string]interface{}) l, ok := e.(map[string]interface{})
if !ok { if !ok {
Failf("element of hit not of expected type: %T", e) Logf("element of hit not of expected type: %T", e)
continue
} }
source, ok := l["_source"].(map[string]interface{}) source, ok := l["_source"].(map[string]interface{})
if !ok { if !ok {
Failf("_source not of the expected type: %T", l["_source"]) Logf("_source not of the expected type: %T", l["_source"])
continue
} }
msg, ok := source["log"].(string) msg, ok := source["log"].(string)
if !ok { if !ok {
Failf("log not of the expected type: %T", source["log"]) Logf("log not of the expected type: %T", source["log"])
continue
} }
words := strings.Split(msg, " ") words := strings.Split(msg, " ")
if len(words) < 4 { if len(words) != 4 {
Failf("Malformed log line: %s", msg) Logf("Malformed log line: %s", msg)
continue
} }
n, err := strconv.ParseUint(words[0], 10, 0) n, err := strconv.ParseUint(words[0], 10, 0)
if err != nil { if err != nil {
Failf("Expecting numer of node as first field of %s", msg) Logf("Expecting numer of node as first field of %s", msg)
continue
} }
if n < 0 || int(n) >= nodeCount { if n < 0 || int(n) >= nodeCount {
Failf("Node count index out of range: %d", nodeCount) Logf("Node count index out of range: %d", nodeCount)
continue
} }
index, err := strconv.ParseUint(words[2], 10, 0) index, err := strconv.ParseUint(words[2], 10, 0)
if err != nil { if err != nil {
Failf("Expecting number as third field of %s", msg) Logf("Expecting number as third field of %s", msg)
continue
} }
if index < 0 || index >= countTo { if index < 0 || index >= countTo {
Failf("Index value out of range: %d", index) Logf("Index value out of range: %d", index)
continue
} }
// Record the observation of a log line from node n at the given index. // Record the observation of a log line from node n at the given index.
observed[n][index]++ observed[n][index]++