From 03f19d35765db09768d623258e738b643f45f498 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Wed, 24 Feb 2016 15:26:29 -0800 Subject: [PATCH] Add nil pointer checks in disk usage integration test. Signed-off-by: Vishnu kannan --- integration/tests/api/docker_test.go | 4 +++- manager/manager.go | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/integration/tests/api/docker_test.go b/integration/tests/api/docker_test.go index 2b728443..ff6a8613 100644 --- a/integration/tests/api/docker_test.go +++ b/integration/tests/api/docker_test.go @@ -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 diff --git a/manager/manager.go b/manager/manager.go index 94651c1f..1c3b551b 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -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)