From 6b6e28d4c7eac8956c52065e02df53fcc872bde5 Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Fri, 14 May 2021 19:21:16 +0200 Subject: [PATCH] Return error at Init for skip collectors early --- collectors/cpustatMetric.go | 3 ++- collectors/infinibandMetric.go | 4 +++- collectors/likwidMetric.go | 3 ++- collectors/loadavgMetric.go | 3 ++- collectors/lustreMetric.go | 4 +++- collectors/memstatMetric.go | 3 ++- collectors/metricCollector.go | 2 +- collectors/netstatMetric.go | 3 ++- collectors/topprocsMetric.go | 3 ++- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/collectors/cpustatMetric.go b/collectors/cpustatMetric.go index 4bbb0ff..6aaaf42 100644 --- a/collectors/cpustatMetric.go +++ b/collectors/cpustatMetric.go @@ -13,9 +13,10 @@ type CpustatCollector struct { MetricCollector } -func (m *CpustatCollector) Init() { +func (m *CpustatCollector) Init() error { m.name = "CpustatCollector" m.setup() + return nil } func ParseStatLine(line string, out map[string]interface{}) { diff --git a/collectors/infinibandMetric.go b/collectors/infinibandMetric.go index 0bb49bb..4878fff 100644 --- a/collectors/infinibandMetric.go +++ b/collectors/infinibandMetric.go @@ -16,9 +16,11 @@ type InfinibandCollector struct { MetricCollector } -func (m *InfinibandCollector) Init() { +func (m *InfinibandCollector) Init() error { m.name = "InfinibandCollector" m.setup() + _, err := ioutil.ReadFile(string(LIDFILE)) + return err } func (m *InfinibandCollector) Read(interval time.Duration) { diff --git a/collectors/likwidMetric.go b/collectors/likwidMetric.go index d4b0aed..d7462e4 100644 --- a/collectors/likwidMetric.go +++ b/collectors/likwidMetric.go @@ -71,7 +71,7 @@ func getSocketCpus() map[C.int]int { return outmap } -func (m *LikwidCollector) Init() { +func (m *LikwidCollector) Init() error { m.name = "LikwidCollector" m.setup() cpulist := CpuList() @@ -111,6 +111,7 @@ func (m *LikwidCollector) Init() { } C.free(unsafe.Pointer(cstr)) } + return nil } func (m *LikwidCollector) Read(interval time.Duration) { diff --git a/collectors/loadavgMetric.go b/collectors/loadavgMetric.go index ae8e103..291b37d 100644 --- a/collectors/loadavgMetric.go +++ b/collectors/loadavgMetric.go @@ -13,9 +13,10 @@ type LoadavgCollector struct { MetricCollector } -func (m *LoadavgCollector) Init() { +func (m *LoadavgCollector) Init() error { m.name = "LoadavgCollector" m.setup() + return nil } func (m *LoadavgCollector) Read(interval time.Duration) { diff --git a/collectors/lustreMetric.go b/collectors/lustreMetric.go index 7f94df7..26d40fb 100644 --- a/collectors/lustreMetric.go +++ b/collectors/lustreMetric.go @@ -14,9 +14,11 @@ type LustreCollector struct { MetricCollector } -func (m *LustreCollector) Init() { +func (m *LustreCollector) Init() error { m.name = "LustreCollector" m.setup() + _, err := ioutil.ReadFile(string(LUSTREFILE)) + return err } func (m *LustreCollector) Read(interval time.Duration) { diff --git a/collectors/memstatMetric.go b/collectors/memstatMetric.go index 9e349f6..0355167 100644 --- a/collectors/memstatMetric.go +++ b/collectors/memstatMetric.go @@ -15,9 +15,10 @@ type MemstatCollector struct { MetricCollector } -func (m *MemstatCollector) Init() { +func (m *MemstatCollector) Init() error { m.name = "MemstatCollector" m.setup() + return nil } func (m *MemstatCollector) Read(interval time.Duration) { diff --git a/collectors/metricCollector.go b/collectors/metricCollector.go index 500058f..31a4a92 100644 --- a/collectors/metricCollector.go +++ b/collectors/metricCollector.go @@ -10,7 +10,7 @@ import ( type MetricGetter interface { Name() string - Init() + Init() error Read(time.Duration) Close() GetNodeMetric() map[string]interface{} diff --git a/collectors/netstatMetric.go b/collectors/netstatMetric.go index 623cf7b..5a4b9de 100644 --- a/collectors/netstatMetric.go +++ b/collectors/netstatMetric.go @@ -15,9 +15,10 @@ type NetstatCollector struct { MetricCollector } -func (m *NetstatCollector) Init() { +func (m *NetstatCollector) Init() error { m.name = "NetstatCollector" m.setup() + return nil } func (m *NetstatCollector) Read(interval time.Duration) { diff --git a/collectors/topprocsMetric.go b/collectors/topprocsMetric.go index 16d0fbb..32a8bda 100644 --- a/collectors/topprocsMetric.go +++ b/collectors/topprocsMetric.go @@ -14,9 +14,10 @@ type TopProcsCollector struct { MetricCollector } -func (m *TopProcsCollector) Init() { +func (m *TopProcsCollector) Init() error { m.name = "TopProcsCollector" m.setup() + return nil } func (m *TopProcsCollector) Read(interval time.Duration) {