prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add nil pointer checks in disk usage integration test.

Browse Source 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan 2016-02-24 15:26:29 -08:00
parent 36415f465a
commit 03f19d3576
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/tests/api/docker_test.go
View File

@ -327,7 +327,9 @@ func TestDockerFilesystemStats(t *testing.T) {
}
sanityCheckV2(containerId, info, t)
require.NotNil(t, info.Stats[0].Filesystem.TotalUsageBytes)
require.NotNil(t, info.Stats[0], "got info: %+v", info)
require.NotNil(t, info.Stats[0].Filesystem, "got info: %+v", info)
require.NotNil(t, info.Stats[0].Filesystem.TotalUsageBytes, "got info: %+v", info.Stats[0].Filesystem)
if *info.Stats[0].Filesystem.TotalUsageBytes >= ddUsage {
if !needsBaseUsageCheck {
pass = true

10
manager/manager.go
View File

@ -54,10 +54,10 @@ var (
// Metrics to be ignored.
ignoreMetrics metricSetValue = metricSetValue{container.MetricSet{}}
// List of metrics that can be ignored.
ignoreWhitelist = map[string]struct{}{
container.DiskUsageMetrics.String(): {},
container.NetworkUsageMetrics.String(): {},
container.NetworkTcpUsageMetrics.String(): {},
ignoreWhitelist = container.MetricSet{
container.DiskUsageMetrics: struct{}{},
container.NetworkUsageMetrics: struct{}{},
container.NetworkTcpUsageMetrics: struct{}{},
}
)
@ -77,7 +77,7 @@ func (ml *metricSetValue) String() string {
func (ml *metricSetValue) Set(value string) error {
for _, metric := range strings.Split(value, ",") {
if _, exists := ignoreWhitelist[metric]; exists {
if ignoreWhitelist.Has(container.MetricKind(metric)) {
(*ml).Add(container.MetricKind(metric))
} else {
return fmt.Errorf("unsupported metric %q specified in disable_metrics", metric)