TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 23:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine: use a singleflight.Group to reduce status contention (#5450)

Browse Source 
Updates tailscale/coral#72

Signed-off-by: Andrew Dunham <andrew@tailscale.com>

Signed-off-by: Andrew Dunham <andrew@tailscale.com>
This commit is contained in:
Andrew Dunham 2022-08-27 12:36:07 -04:00 committed by GitHub
parent 70f9fc8c7a
commit e8f09d24c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wgengine/pendopen.go
View File

@ -157,12 +157,21 @@ func (e *userspaceEngine) onOpenTimeout(flow flowtrack.Tuple) {
return return
} }
// We don't care if this information is perfectly up-to-date, since
// we're just using it to print debug information.
//
// In tailscale/coral#72, we see a goroutine profile with thousands of
// goroutines blocked on the mutex in getStatus here, so we wrap it in
// a singleflight and accept stale information to reduce contention.
st, err, _ := e.getStatusSf.Do(struct{}{}, e.getStatus)
var ps *ipnstate.PeerStatusLite var ps *ipnstate.PeerStatusLite
if st, err := e.getStatus(); err == nil { if err == nil {
for _, v := range st.Peers { for _, v := range st.Peers {
if v.NodeKey == n.Key { if v.NodeKey == n.Key {
v := v // copy v := v // copy
ps = &v ps = &v
break
} }
} }
} else { } else {

5
wgengine/userspace.go
View File

@ -46,6 +46,7 @@ import (
"tailscale.com/util/clientmetric" "tailscale.com/util/clientmetric"
"tailscale.com/util/deephash" "tailscale.com/util/deephash"
"tailscale.com/util/mak" "tailscale.com/util/mak"
"tailscale.com/util/singleflight"
"tailscale.com/version" "tailscale.com/version"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
"tailscale.com/wgengine/magicsock" "tailscale.com/wgengine/magicsock"
@ -146,6 +147,10 @@ type userspaceEngine struct {
// value of the ICMP identifer and sequence number concatenated. // value of the ICMP identifer and sequence number concatenated.
icmpEchoResponseCallback map[uint32]func() icmpEchoResponseCallback map[uint32]func()
// this singleflight is used to deduplicate calls to getStatus when we
// don't care if the data is perfectly fresh
getStatusSf singleflight.Group[struct{}, *Status]
// Lock ordering: magicsock.Conn.mu, wgLock, then mu. // Lock ordering: magicsock.Conn.mu, wgLock, then mu.
} }