Skip to content

Fix leaking timer goroutines #186

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

Open
andrewdeandrade wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −12
Open

Fix leaking timer goroutines #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 26 additions & 12 deletions ringpop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ type Ringpop struct {

logger log.Logger

tickers chan *clock.Ticker
startTime time.Time
tickers chan *clock.Ticker
tickersStop chan bool
startTime time.Time
}

// state represents the internal state of a Ringpop instance.
Expand Down Expand Up @@ -212,16 +213,22 @@ func (rp *Ringpop) startTimers() {
return
}
rp.tickers = make(chan *clock.Ticker, 32) // 32 == max number of tickers
rp.tickersStop = make(chan bool, 1)

if rp.config.MembershipChecksumStatPeriod != StatPeriodNever {
ticker := rp.clock.Ticker(rp.config.MembershipChecksumStatPeriod)
rp.tickers <- ticker
go func() {
for _ = range ticker.C {
rp.statter.UpdateGauge(
rp.getStatKey("membership.checksum-periodic"),
nil,
int64(rp.node.GetChecksum()))
for {
select {
case <-ticker.C:
rp.statter.UpdateGauge(
rp.getStatKey("membership.checksum-periodic"),
nil,
int64(rp.node.GetChecksum()))
case <-rp.tickersStop:
return
}
}
}()
}
Expand All @@ -230,11 +237,16 @@ func (rp *Ringpop) startTimers() {
ticker := rp.clock.Ticker(rp.config.RingChecksumStatPeriod)
rp.tickers <- ticker
go func() {
for _ = range ticker.C {
rp.statter.UpdateGauge(
rp.getStatKey("ring.checksum-periodic"),
nil,
int64(rp.ring.Checksum()))
for {
select {
case <-ticker.C:
rp.statter.UpdateGauge(
rp.getStatKey("ring.checksum-periodic"),
nil,
int64(rp.ring.Checksum()))
case <-rp.tickersStop:
return
}
}
}()
}
Expand All @@ -246,6 +258,8 @@ func (rp *Ringpop) stopTimers() {
for ticker := range rp.tickers {
ticker.Stop()
}
close(rp.tickersStop)
rp.tickersStop = nil
Copy link
Copy Markdown
Contributor

@thanodnl thanodnl Nov 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line causes a data race with lines 229 and 247. Is it really needed to set it to nil when the timers are stopped?

rp.tickers = nil
}
}
Expand Down