ipn/ipnlocal, drive: stop using netmap.NetworkMap in Taildrive too
This applies the same treatment from PR #20162 (netlog) and PR #20171 (wglog) to the local Taildrive filesystem wiring, ending the per-netmap-update O(n) rebuild of the drive remotes list. This moves the O(n peers) taildrive-remote list rebuild from every peer change (which previously happened regardless of whether you were even using taildrive) to instead happen only as needed. That running on every netmap update and was a contributor to the broader quadratic behavior we want to eliminate when a single peer is added or removed. Instead, this introduces drive.RemoteSource, a small interface the Taildrive filesystem pulls from lazily on incoming WebDAV requests, and caches by a generation counter. ipn/ipnlocal installs a driveRemoteSource once at NewLocalBackend time and bumps LocalBackend.driveGen on the three events that can actually flip the drive-capable peer set: full netmap installs (domain + self caps), UpdateNetmapDelta (peer add/remove or per-peer address changes), and updatePacketFilter (since PeerCapability values are derived from the packet filter rules, not from peer.CapMap). The hook itself is kept but narrowed: it no longer takes a *netmap.NetworkMap and its only remaining job is to re-notify IPN bus listeners of the current local shares list on full installs. This is a dependency to removing the netmap.NetworkMap type from upstream callers, like wgengine.Engine in general. (Also add a bunch more tests) Updates #12542 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com> Change-Id: I7e3d2f5b4a9c8e1d6f0a3b7c9e2d4f8a1b6c5e9d
This commit is contained in:
committed by
Brad Fitzpatrick
parent
988b0905bb
commit
1d69894084
@@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"iter"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
@@ -456,10 +457,48 @@ func (r *remote) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
||||
}
|
||||
|
||||
type system struct {
|
||||
t *testing.T
|
||||
local *local
|
||||
client *gowebdav.Client
|
||||
t *testing.T
|
||||
local *local
|
||||
client *gowebdav.Client
|
||||
transport http.RoundTripper
|
||||
|
||||
mu sync.Mutex
|
||||
remotes map[string]*remote
|
||||
gen uint64
|
||||
}
|
||||
|
||||
// Domain implements [drive.RemoteSource].
|
||||
func (s *system) Domain() string { return domain }
|
||||
|
||||
// Transport implements [drive.RemoteSource].
|
||||
func (s *system) Transport() http.RoundTripper { return s.transport }
|
||||
|
||||
// Remotes implements [drive.RemoteSource].
|
||||
func (s *system) Remotes() iter.Seq[*drive.Remote] {
|
||||
s.mu.Lock()
|
||||
rs := make([]*drive.Remote, 0, len(s.remotes))
|
||||
for name, r := range s.remotes {
|
||||
url := fmt.Sprintf("http://%s", r.ln.Addr())
|
||||
rs = append(rs, &drive.Remote{
|
||||
Name: name,
|
||||
URL: func() string { return url },
|
||||
})
|
||||
}
|
||||
s.mu.Unlock()
|
||||
return func(yield func(*drive.Remote) bool) {
|
||||
for _, r := range rs {
|
||||
if !yield(r) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Generation implements [drive.RemoteSource].
|
||||
func (s *system) Generation() uint64 {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
return s.gen
|
||||
}
|
||||
|
||||
func newSystem(t *testing.T) *system {
|
||||
@@ -486,11 +525,16 @@ func newSystem(t *testing.T) *system {
|
||||
client := gowebdav.NewAuthClient(fmt.Sprintf("http://%s", ln.Addr()), &noopAuthorizer{})
|
||||
client.SetTransport(&http.Transport{DisableKeepAlives: true})
|
||||
s := &system{
|
||||
t: t,
|
||||
local: &local{ln: ln, fs: fs},
|
||||
t: t,
|
||||
local: &local{ln: ln, fs: fs},
|
||||
transport: &http.Transport{
|
||||
DisableKeepAlives: true,
|
||||
ResponseHeaderTimeout: 5 * time.Second,
|
||||
},
|
||||
client: client,
|
||||
remotes: make(map[string]*remote),
|
||||
}
|
||||
fs.SetRemoteSource(s)
|
||||
t.Cleanup(s.stop)
|
||||
return s
|
||||
}
|
||||
@@ -518,22 +562,11 @@ func (s *system) addRemote(name string) string {
|
||||
}
|
||||
r.fs.SetFileServerAddr(fileServer.Addr())
|
||||
go http.Serve(ln, r)
|
||||
s.remotes[name] = r
|
||||
|
||||
remotes := make([]*drive.Remote, 0, len(s.remotes))
|
||||
for name, r := range s.remotes {
|
||||
remotes = append(remotes, &drive.Remote{
|
||||
Name: name,
|
||||
URL: func() string { return fmt.Sprintf("http://%s", r.ln.Addr()) },
|
||||
})
|
||||
}
|
||||
s.local.fs.SetRemotes(
|
||||
domain,
|
||||
remotes,
|
||||
&http.Transport{
|
||||
DisableKeepAlives: true,
|
||||
ResponseHeaderTimeout: 5 * time.Second,
|
||||
})
|
||||
s.mu.Lock()
|
||||
s.remotes[name] = r
|
||||
s.gen++
|
||||
s.mu.Unlock()
|
||||
|
||||
return fileServer.Addr()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user