Merge pull request #3731 from bboreham/reuse-timer

Re-use timer in remote storage queue
This commit is contained in:
Tom Wilkie 2018-02-05 10:54:08 +01:00 committed by GitHub
commit a730083cbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -430,6 +430,8 @@ func (s *shards) runShard(i int) {
// anyways.
pendingSamples := model.Samples{}
timer := time.NewTimer(s.qm.cfg.BatchSendDeadline)
for {
select {
case sample, ok := <-queue:
@ -449,7 +451,11 @@ func (s *shards) runShard(i int) {
s.sendSamples(pendingSamples[:s.qm.cfg.MaxSamplesPerSend])
pendingSamples = pendingSamples[s.qm.cfg.MaxSamplesPerSend:]
}
case <-time.After(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)
pendingSamples = pendingSamples[:0]