ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-10-31 17:05:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Corrected unlock access to batch slice

Browse Source
This commit is contained in:
Holger Obermaier
2023-10-09 16:48:42 +02:00
parent dd40c852ca
commit 3be11984f2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sinks/influxSink.go
View File

@@ -155,7 +155,6 @@ func (s *InfluxSink) connect() error {
} }
func (s *InfluxSink) Write(m lp.CCMetric) error { func (s *InfluxSink) Write(m lp.CCMetric) error {
if s.flushDelay != 0 && s.flushTimerMutex.TryLock() { if s.flushDelay != 0 && s.flushTimerMutex.TryLock() {
// Setup flush timer when flush delay is configured // Setup flush timer when flush delay is configured
@@ -183,7 +182,6 @@ func (s *InfluxSink) Write(m lp.CCMetric) error {
// Protect access to batch slice // Protect access to batch slice
s.batchMutex.Lock() s.batchMutex.Lock()
defer s.batchMutex.Unlock()
// batch slice full, dropping oldest metric(s) // batch slice full, dropping oldest metric(s)
// e.g. when previous flushes failed and batch slice was not cleared // e.g. when previous flushes failed and batch slice was not cleared
@@ -259,6 +257,9 @@ func (s *InfluxSink) Write(m lp.CCMetric) error {
// Check that encoding worked // Check that encoding worked
if err := s.encoder.Err(); err != nil { if err := s.encoder.Err(); err != nil {
cclog.ComponentError(s.name, "Write():", "Encoding failed:", err) cclog.ComponentError(s.name, "Write():", "Encoding failed:", err)
// Unlock access to batch slice
s.batchMutex.Unlock()
return err return err
} }
@@ -282,9 +283,13 @@ func (s *InfluxSink) Write(m lp.CCMetric) error {
} }
} }
// Unlock access to batch slice
s.batchMutex.Unlock()
return s.Flush() return s.Flush()
} }
// Unlock access to batch slice
s.batchMutex.Unlock()
return nil return nil
} }