RecycledCloud/smartctl_exporter
6
0
Fork 0
mirror of https://github.com/prometheus-community/smartctl_exporter.git synced 2024-11-16 01:33:07 +01:00
Code Issues Projects Releases 1 Packages Wiki Activity

Merge pull request #94 from NiceGuyIT/issue-23

Browse source 
Fixes #23: Race condition with maps and goroutines
This commit is contained in:
Ben Kochie 2022-11-06 11:38:21 +01:00 committed by GitHub
commit 97947b0e27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
readjson.go
View file

@ -18,6 +18,7 @@ import (
"io/ioutil" "io/ioutil"
"os/exec" "os/exec"
"strings" "strings"
"sync"
"time" "time"
"github.com/go-kit/log" "github.com/go-kit/log"
@ -32,11 +33,11 @@ type JSONCache struct {
} }
var ( var (
jsonCache map[string]JSONCache jsonCache sync.Map
) )
func init() { func init() {
jsonCache = make(map[string]JSONCache) jsonCache.Store("", JSONCache{})
} }
// Parse json to gjson object // Parse json to gjson object
@ -93,16 +94,20 @@ func readData(logger log.Logger, device string) (gjson.Result, error) {
return readFakeSMARTctl(logger, device), nil return readFakeSMARTctl(logger, device), nil
} }
cacheValue, cacheOk := jsonCache[device] cacheValue, cacheOk := jsonCache.Load(device)
if !cacheOk || time.Now().After(cacheValue.LastCollect.Add(*smartctlInterval)) { if !cacheOk || time.Now().After(cacheValue.(JSONCache).LastCollect.Add(*smartctlInterval)) {
json, ok := readSMARTctl(logger, device) json, ok := readSMARTctl(logger, device)
if ok { if ok {
jsonCache[device] = JSONCache{JSON: json, LastCollect: time.Now()} jsonCache.Store(device, JSONCache{JSON: json, LastCollect: time.Now()})
return jsonCache[device].JSON, nil j, found := jsonCache.Load(device)
if !found {
level.Warn(logger).Log("msg", "device not found", "device", device)
}
return j.(JSONCache).JSON, nil
} }
return gjson.Parse("{}"), fmt.Errorf("smartctl returned bad data for device %s", device) return gjson.Parse("{}"), fmt.Errorf("smartctl returned bad data for device %s", device)
} }
return cacheValue.JSON, nil return cacheValue.(JSONCache).JSON, nil
} }
// Parse smartctl return code // Parse smartctl return code