mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Correctly stop the timer used in the remote write path.

Browse source
This commit is contained in:
Tom Wilkie 2018-03-09 12:00:26 +00:00
parent 042090a6d3
commit f8c9d375b6
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
storage/remote/queue_manager.go
View file

@ -430,6 +430,14 @@ func (s *shards) runShard(i int) {
pendingSamples := model.Samples{}
timer := time.NewTimer(s.qm.cfg.BatchSendDeadline)
defer func() {
if !timer.Stop() {
select {
case <-timer.C:
default:
}
}
}()
for {
select {
@ -449,11 +457,16 @@ func (s *shards) runShard(i int) {
for len(pendingSamples) >= s.qm.cfg.MaxSamplesPerSend {
s.sendSamples(pendingSamples[:s.qm.cfg.MaxSamplesPerSend])
pendingSamples = pendingSamples[s.qm.cfg.MaxSamplesPerSend:]
if !timer.Stop() {
select {
case <-timer.C:
default:
}
}
timer.Reset(s.qm.cfg.BatchSendDeadline)
}
if !timer.Stop() {
<-timer.C
}
timer.Reset(s.qm.cfg.BatchSendDeadline)
case <-timer.C:
if len(pendingSamples) > 0 {
s.sendSamples(pendingSamples)