kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

e2e: give metrics longer to settle (#6884)

Browse Source 
Increase the shortened timeout after the first loop so that metrics
that take longer to come in aren't failing the test unnecessarily.

Move the check for empty alloc metrics into the loop so that if the
first values we get are empty we don't fail the test too early.
This commit is contained in:
Tim Gross
2019-12-20 10:39:35 -05:00
committed by GitHub
parent ac7990f2a7
commit 6aab515ab0
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e2e/metrics/metrics.go
View File

@@ -162,12 +162,12 @@ func (tc *MetricsTest) queryClientMetrics(t *testing.T, clientNodes []string) {
}
return true
}, timeout, 1*time.Second)
require.Truef(t, ok, "prometheus query failed: %v", err)
require.Truef(t, ok, "prometheus query failed (%s): %v", metric, err)
// shorten the timeout after the first workload is successfully
// queried so that we don't hang the whole test run if something's
// wrong with only one of the jobs
timeout = 10 * time.Second
timeout = 15 * time.Second
}
}
@@ -186,19 +186,20 @@ func (tc *MetricsTest) queryAllocMetrics(t *testing.T, workloads map[string]stri
if err != nil {
return false
}
// make sure we didn't just collect a bunch of zero metrics
lastResult := results[len(results)-1]
if !(float64(lastResult.Value) > 0.0) {
err = fmt.Errorf("expected non-zero metrics, got: %v", results)
return false
}
return true
}, timeout, 1*time.Second)
require.Truef(t, ok, "prometheus query failed: %v", err)
// make sure we didn't just collect a bunch of zero metrics
lastResult := results[len(results)-1]
require.Greaterf(t, float64(lastResult.Value), 0.0,
"expected non-zero metrics: %v", results,
)
require.Truef(t, ok, "prometheus query failed (%s): %v", query, err)
// shorten the timeout after the first workload is successfully
// queried so that we don't hang the whole test run if something's
// wrong with only one of the jobs
timeout = 10 * time.Second
timeout = 15 * time.Second
}
}