Skip to content

Better handle indexing race condition for non-ol9 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shriyanshk128T merged 2 commits into from
May 7, 2025
Merged

Better handle indexing race condition for non-ol9 #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0903e
better handle indexing race condition
shriyanshk128T Apr 29, 2025
7daab1a
remove buffer changes and update defer func
shriyanshk128T May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 51 additions & 11 deletions plugins/inputs/t128_tank/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"regexp"
"strconv"
"strings"
"sync"
"time"

"github.com/influxdata/telegraf"
Expand Down Expand Up @@ -132,28 +133,57 @@ func (r *Reader) Run(mainCtx context.Context) {
readCtxCancel()
return
}

var wg sync.WaitGroup
nextSaveCheck := time.NewTicker(2 * time.Second)
defer func() {
readCtxCancel()
close(r.lastObservedIndex)
observedValue, ok := <-r.lastObservedIndex
if ok {
r.setIndex(r.indexPath, index{value: observedValue})
go func() {
wg.Wait()
close(r.lastObservedIndex)
}()

var anyFound bool
var lastObservedValue uint64
drainLoop:
for {
select {
case observedValue, ok := <-r.lastObservedIndex:
if !ok {
break drainLoop
}
anyFound = true
lastObservedValue = observedValue
case <-r.readDone:
}
}
if anyFound {
r.setIndex(r.indexPath, index{value: lastObservedValue})
} else {
r.setIndex(r.indexPath, index{value: lastIndex.value})
}
}()
go r.read(readCtx, lastIndex.next())

wg.Add(1)
go func() {
defer wg.Done()
r.read(readCtx, lastIndex.next())
}()

for {
select {
case <-mainCtx.Done():
r.log.Errorf("%s reader done", r.topic)
return
case observedValue = <-r.lastObservedIndex:
if lastIndex.value%1000 == 0 {
r.setIndex(r.indexPath, index{value: lastIndex.value})

case val := <-r.lastObservedIndex:
if val > lastIndex.value {
lastIndex.value = val
if lastIndex.value%1000 == 0 {
r.setIndex(r.indexPath, index{value: lastIndex.value})
}
}

case <-nextSaveCheck.C:
if observedValue > lastIndex.value {
lastIndex.value = observedValue
Expand All @@ -165,10 +195,21 @@ func (r *Reader) Run(mainCtx context.Context) {
if err != nil && errors.As(err, &errBoundaryFault) {
r.log.Debugf("detected boundary fault, restarting %s tank read from index %d", r.topic, errBoundaryFault.nextAvailableIndex.value)
lastIndex = errBoundaryFault.nextAvailableIndex
go r.read(readCtx, lastIndex)
wg.Add(1)
go func() {
defer wg.Done()
r.read(readCtx, lastIndex)
}()
} else {
if observedValue > lastIndex.value {
lastIndex.value = observedValue
}
lastIndex = lastIndex.next()
go r.read(readCtx, lastIndex)
wg.Add(1)
go func() {
defer wg.Done()
r.read(readCtx, lastIndex)
}()
}
}
}
Expand Down Expand Up @@ -391,4 +432,3 @@ func isBoundaryFault(line string) (bool, index) {

return true, nextIndex
}