octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-09-19 21:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't perform external discovery lookups until local cache has had time to warm (fixes #666)

Browse Source
This commit is contained in:
Jakob Borg 2014-11-26 17:23:15 +01:00
parent 06ef33ff5e
commit ed85bfa915
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/discover/discover.go
View File

@ -34,6 +34,7 @@ type Discoverer struct {
myID protocol.DeviceID
listenAddrs []string
localBcastIntv time.Duration
localBcastStart time.Time
globalBcastIntv time.Duration
errorRetryIntv time.Duration
cacheLifetime time.Duration
@ -104,6 +105,7 @@ func (d *Discoverer) StartLocal(localPort int, localMCAddr string) {
} else {
d.localBcastTick = time.Tick(d.localBcastIntv)
d.forcedBcastTick = make(chan time.Time)
d.localBcastStart = time.Now()
go d.sendLocalAnnouncements()
}
}
@ -142,7 +144,10 @@ func (d *Discoverer) Lookup(device protocol.DeviceID) []string {
addrs[i] = cached[i].Address
}
return addrs
} else if len(d.extServer) != 0 {
} else if len(d.extServer) != 0 && time.Since(d.localBcastStart) > d.localBcastIntv {
// Only perform external lookups if we have at least one external
// server and one local announcement interval has passed. This is to
// avoid finding local peers on their remote address at startup.
addrs := d.externalLookup(device)
cached = make([]CacheEntry, len(addrs))
for i := range addrs {
@ -258,7 +263,10 @@ func (d *Discoverer) sendExternalAnnouncements() {
buf = d.announcementPkt()
}
nextAnnouncement := time.NewTimer(0)
// Delay the first announcement until after a full local announcement
// cycle, to increase the chance of other peers finding us locally first.
nextAnnouncement := time.NewTimer(d.localBcastIntv)
for {
select {
case <-d.stopGlobal: