Skip to content

discovery table: revalidate race fix #11159

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
AskAlexSharov merged 2 commits into from
Jul 16, 2024
Merged

discovery table: revalidate race fix #11159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8055080
save
AskAlexSharov Jul 15, 2024
5cd6c0b
save
AskAlexSharov Jul 16, 2024
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
5 changes: 3 additions & 2 deletions p2p/discover/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ func (tab *Table) loop() {
go tab.doRefresh(refreshDone)

var minRefreshTimer *time.Timer
var minRefreshTimerActive atomic.Bool

defer func() {
if minRefreshTimer != nil {
Expand Down Expand Up @@ -296,9 +297,9 @@ loop:
}
case <-revalidateDone:
revalidate.Reset(tab.revalidateInterval)
if tab.live() == 0 && len(waiting) == 0 && minRefreshTimer == nil {
if tab.live() == 0 && len(waiting) == 0 && minRefreshTimerActive.CompareAndSwap(false, true) {
Comment thread
AskAlexSharov marked this conversation as resolved.
minRefreshTimer = time.AfterFunc(minRefreshInterval, func() {
minRefreshTimer = nil
defer minRefreshTimerActive.Store(false)
tab.net.lookupRandom()
tab.refresh()
})
Expand Down