From a40dc18d631986fc852d2e62d8d71c033c53f471 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Fri, 14 Feb 2020 12:01:24 -0500 Subject: [PATCH] Fix swap metrics --- cgroup_exporter.go | 4 ++-- cgroup_exporter_test.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cgroup_exporter.go b/cgroup_exporter.go index cd90924..f221dbc 100644 --- a/cgroup_exporter.go +++ b/cgroup_exporter.go @@ -277,8 +277,8 @@ func (e *Exporter) collect() ([]CgroupMetric, error) { metric.cpuTotal = float64(stats.CPU.Usage.Total) / 1000000000.0 metric.memoryUsed = float64(stats.Memory.Usage.Usage) metric.memoryTotal = float64(stats.Memory.Usage.Limit) - metric.swapUsed = float64(stats.Memory.Swap.Usage) - metric.swapTotal = float64(stats.Memory.Swap.Limit) + metric.swapUsed = float64(stats.Memory.Swap.Usage) - metric.memoryUsed + metric.swapTotal = float64(stats.Memory.Swap.Limit) - metric.memoryTotal if cpus, err := getCPUs(name); err == nil { metric.cpus = cpus } diff --git a/cgroup_exporter_test.go b/cgroup_exporter_test.go index 2be27fb..ee05d9a 100644 --- a/cgroup_exporter_test.go +++ b/cgroup_exporter_test.go @@ -76,10 +76,10 @@ func TestCollectUserSlice(t *testing.T) { if val := metrics[0].memoryTotal; val != 68719476736 { t.Errorf("Unexpected value for memoryTotal, got %v", val) } - if val := metrics[0].swapUsed; val != 8081408 { + if val := metrics[0].swapUsed; val != 0 { t.Errorf("Unexpected value for swapUsed, got %v", val) } - if val := metrics[0].swapTotal; val != 9223372036854771712 { + if val := metrics[0].swapTotal; val != 9223371968135295000 { t.Errorf("Unexpected value for swapTotal, got %v", val) } if val := metrics[0].uid; val != "20821" { @@ -125,10 +125,10 @@ func TestCollectSLURM(t *testing.T) { if val := metrics[0].memoryTotal; val != 2147483648 { t.Errorf("Unexpected value for memoryTotal, got %v", val) } - if val := metrics[0].swapUsed; val != 356352 { + if val := metrics[0].swapUsed; val != 0 { t.Errorf("Unexpected value for swapUsed, got %v", val) } - if val := metrics[0].swapTotal; val != 2147483648 { + if val := metrics[0].swapTotal; val != 0 { t.Errorf("Unexpected value for swapTotal, got %v", val) } if val := metrics[0].uid; val != "20821" { @@ -177,10 +177,10 @@ func TestCollectTorque(t *testing.T) { if val := metrics[0].memoryTotal; val != 196755132416 { t.Errorf("Unexpected value for memoryTotal, got %v", val) } - if val := metrics[0].swapUsed; val != 82553999360 { + if val := metrics[0].swapUsed; val != 0 { t.Errorf("Unexpected value for swapUsed, got %v", val) } - if val := metrics[0].swapTotal; val != 196755132416 { + if val := metrics[0].swapTotal; val != 0 { t.Errorf("Unexpected value for swapTotal, got %v", val) } if val := metrics[0].uid; val != "" {