CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race issue in tick_test.go (#7663)

This commit is contained in:
Daniel Nelson 2020-06-11 10:09:19 -07:00 committed by GitHub
parent dda46ea32b
commit 347065a4a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
agent/tick_test.go
View File

@ -21,6 +21,7 @@ func TestAlignedTicker(t *testing.T) {
until := since.Add(60 * time.Second) until := since.Add(60 * time.Second)
ticker := newAlignedTicker(since, interval, jitter, clock) ticker := newAlignedTicker(since, interval, jitter, clock)
defer ticker.Stop()
expected := []time.Time{ expected := []time.Time{
time.Unix(10, 0).UTC(), time.Unix(10, 0).UTC(),
@ -32,11 +33,12 @@ func TestAlignedTicker(t *testing.T) {
} }
actual := []time.Time{} actual := []time.Time{}
clock.Add(10 * time.Second)
for !clock.Now().After(until) { for !clock.Now().After(until) {
select { select {
case tm := <-ticker.Elapsed(): case tm := <-ticker.Elapsed():
actual = append(actual, tm.UTC()) actual = append(actual, tm.UTC())
default:
} }
clock.Add(10 * time.Second) clock.Add(10 * time.Second)
} }
@ -53,6 +55,7 @@ func TestAlignedTickerJitter(t *testing.T) {
until := since.Add(60 * time.Second) until := since.Add(60 * time.Second)
ticker := newAlignedTicker(since, interval, jitter, clock) ticker := newAlignedTicker(since, interval, jitter, clock)
defer ticker.Stop()
last := since last := since
for !clock.Now().After(until) { for !clock.Now().After(until) {
@ -75,6 +78,7 @@ func TestAlignedTickerMissedTick(t *testing.T) {
since := clock.Now() since := clock.Now()
ticker := newAlignedTicker(since, interval, jitter, clock) ticker := newAlignedTicker(since, interval, jitter, clock)
defer ticker.Stop()
clock.Add(25 * time.Second) clock.Add(25 * time.Second)
tm := <-ticker.Elapsed() tm := <-ticker.Elapsed()
@ -94,6 +98,7 @@ func TestUnalignedTicker(t *testing.T) {
until := since.Add(60 * time.Second) until := since.Add(60 * time.Second)
ticker := newUnalignedTicker(interval, jitter, clock) ticker := newUnalignedTicker(interval, jitter, clock)
defer ticker.Stop()
expected := []time.Time{ expected := []time.Time{
time.Unix(1, 0).UTC(), time.Unix(1, 0).UTC(),
@ -128,6 +133,7 @@ func TestRollingTicker(t *testing.T) {
until := since.Add(60 * time.Second) until := since.Add(60 * time.Second)
ticker := newUnalignedTicker(interval, jitter, clock) ticker := newUnalignedTicker(interval, jitter, clock)
defer ticker.Stop()
expected := []time.Time{ expected := []time.Time{
time.Unix(1, 0).UTC(), time.Unix(1, 0).UTC(),
@ -166,6 +172,7 @@ func TestAlignedTickerDistribution(t *testing.T) {
since := clock.Now() since := clock.Now()
ticker := newAlignedTicker(since, interval, jitter, clock) ticker := newAlignedTicker(since, interval, jitter, clock)
defer ticker.Stop()
dist := simulatedDist(ticker, clock) dist := simulatedDist(ticker, clock)
printDist(dist) printDist(dist)
require.True(t, 350 < dist.Count) require.True(t, 350 < dist.Count)
@ -185,6 +192,7 @@ func TestUnalignedTickerDistribution(t *testing.T) {
clock := clock.NewMock() clock := clock.NewMock()
ticker := newUnalignedTicker(interval, jitter, clock) ticker := newUnalignedTicker(interval, jitter, clock)
defer ticker.Stop()
dist := simulatedDist(ticker, clock) dist := simulatedDist(ticker, clock)
printDist(dist) printDist(dist)
require.True(t, 350 < dist.Count) require.True(t, 350 < dist.Count)
@ -204,6 +212,7 @@ func TestRollingTickerDistribution(t *testing.T) {
clock := clock.NewMock() clock := clock.NewMock()
ticker := newRollingTicker(interval, jitter, clock) ticker := newRollingTicker(interval, jitter, clock)
defer ticker.Stop()
dist := simulatedDist(ticker, clock) dist := simulatedDist(ticker, clock)
printDist(dist) printDist(dist)
require.True(t, 275 < dist.Count) require.True(t, 275 < dist.Count)

2
go.mod
View File

@ -26,7 +26,7 @@ require (
github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740 github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740
github.com/armon/go-metrics v0.3.0 // indirect github.com/armon/go-metrics v0.3.0 // indirect
github.com/aws/aws-sdk-go v1.30.9 github.com/aws/aws-sdk-go v1.30.9
github.com/benbjohnson/clock v1.0.2 github.com/benbjohnson/clock v1.0.3
github.com/bitly/go-hostpool v0.1.0 // indirect github.com/bitly/go-hostpool v0.1.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/caio/go-tdigest v2.3.0+incompatible // indirect github.com/caio/go-tdigest v2.3.0+incompatible // indirect

4
go.sum
View File

@ -112,8 +112,8 @@ github.com/armon/go-metrics v0.3.0 h1:B7AQgHi8QSEi4uHu7Sbsga+IJDU+CENgjxoo81vDUq
github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
github.com/aws/aws-sdk-go v1.30.9 h1:DntpBUKkchINPDbhEzDRin1eEn1TG9TZFlzWPf0i8to= github.com/aws/aws-sdk-go v1.30.9 h1:DntpBUKkchINPDbhEzDRin1eEn1TG9TZFlzWPf0i8to=
github.com/aws/aws-sdk-go v1.30.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.30.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/benbjohnson/clock v1.0.2 h1:Z0CN0Yb4ig9sGPXkvAQcGJfnrrMQ5QYLCMPRi9iD7YE= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg=
github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=