ipn/ipnlocal, control/controlclient: process node adds/removes in constant time
For large tailnets (~50k+ nodes) with frequent peer churn (ephemeral
GitHub Actions workers etc.), tailscaled used to rebuild the full
netmap and fan it out on the IPN bus on every MapResponse that
added or removed a peer. There were two O(N) costs per delta: the
full netmap rebuild + every Notify.NetMap encode to every bus watcher.
This change tackles both:
1. Plumb O(1) peer add/remove through the delta path. PeersChanged
and PeersRemoved no longer prevent the delta happy path; instead,
they mutate the per-node-backend peer map in place.
2. Restrict ipn.Notify.NetMap emission to the platforms whose host
GUIs still depend on it (Windows, macOS, iOS) and migrate
in-tree consumers off it everywhere else:
- Migrate reactive consumers (containerboot, kube agents,
sniproxy, tsconsensus, etc.) off Notify.NetMap to the
previously-added Notify.SelfChange signal so they no longer
have to subscribe to the full netmap.
- Add ipn.NotifyNoNetMap so GUI clients on "legacy-emit" platforms
that have already migrated can opt out of the per-watcher
NetMap encode.
- Gate Notify.NetMap emission on the producer side by a compile-
time GOOS check, so the supporting code is dead-code-eliminated
on Linux and other geese where no GUI consumer needs it.
Re-running BenchmarkGiantTailnet from tstest/largetailnet, which was
added along with baseline numbers on unmodified main in ad5436af0d,
the per-delta cost (one peer add+remove pair) is now ~O(1) regardless
of tailnet size N:
N no-watcher (ms/op) bus-watcher (ms/op)
before now factor before now factor
10000 32 0.11 300x 166 0.13 1300x
50000 222 0.11 2000x 865 0.13 6700x
100000 504 0.12 4100x 1765 0.13 13400x
250000 1551 0.12 12500x 4696 0.15 32400x
Updates #12542
Change-Id: I94e34b37331d1a8ec74c299deffadf4d061fda9e
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
2703f91174
commit
aa5da2e5f2
@@ -200,8 +200,6 @@ func (h *Handler) serveDebug(w http.ResponseWriter, r *http.Request) {
|
||||
break
|
||||
}
|
||||
h.b.DebugNotify(n)
|
||||
case "notify-last-netmap":
|
||||
h.b.DebugNotifyLastNetMap()
|
||||
case "break-tcp-conns":
|
||||
err = h.b.DebugBreakTCPConns()
|
||||
case "break-derp-conns":
|
||||
|
||||
@@ -90,6 +90,7 @@ var handler = map[string]LocalAPIHandler{
|
||||
"shutdown": (*Handler).serveShutdown,
|
||||
"start": (*Handler).serveStart,
|
||||
"status": (*Handler).serveStatus,
|
||||
"user-profile": (*Handler).serveUserProfile,
|
||||
"whois": (*Handler).serveWhoIs,
|
||||
}
|
||||
|
||||
@@ -900,6 +901,12 @@ func (h *Handler) serveWatchIPNBus(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
mask = ipn.NotifyWatchOpt(v)
|
||||
}
|
||||
// NotifyInitialNetMap is permitted alongside NotifyPeerChanges /
|
||||
// NotifyPeerPatches for backwards compatibility with clients that
|
||||
// set both (e.g. the Apple client). On platforms where
|
||||
// goosGetsLegacyNetmapNotify is true, the initial netmap is
|
||||
// delivered regardless; peer-change subscribers simply receive
|
||||
// deltas after that point.
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
ctx := r.Context()
|
||||
@@ -1138,12 +1145,14 @@ type peerByIDBackend interface {
|
||||
PeerByID(tailcfg.NodeID) (tailcfg.NodeView, bool)
|
||||
}
|
||||
|
||||
// servePeerByID returns the current full [tailcfg.Node] for the peer with
|
||||
// the NodeID given in the "id" query parameter, in O(1) time. It returns
|
||||
// 404 if no such peer is in the current netmap.
|
||||
// servePeerByID returns the current full [tailcfg.Node] for the peer with the
|
||||
// NodeID given in the "id" query parameter. It returns 404 if no such peer is
|
||||
// in the current netmap.
|
||||
//
|
||||
// It is intended for clients that need the latest state of a single peer
|
||||
// without fetching the entire netmap.
|
||||
// It is intended for clients that observed a peer-mutation signal (e.g.
|
||||
// [ipn.Notify.PeerChangedPatch] or [ipn.Notify.PeersChanged]) and want the
|
||||
// latest state of the affected node without having to apply the patch
|
||||
// themselves.
|
||||
func (h *Handler) servePeerByID(w http.ResponseWriter, r *http.Request) {
|
||||
h.servePeerByIDWithBackend(w, r, h.b)
|
||||
}
|
||||
@@ -1170,6 +1179,45 @@ func (h *Handler) servePeerByIDWithBackend(w http.ResponseWriter, r *http.Reques
|
||||
e.Encode(nv.AsStruct())
|
||||
}
|
||||
|
||||
// userProfileBackend is the subset of [ipnlocal.LocalBackend] used by
|
||||
// [Handler.serveUserProfile]. It exists so the handler can be tested
|
||||
// with a trivial mock without spinning up a full LocalBackend.
|
||||
type userProfileBackend interface {
|
||||
UserProfile(tailcfg.UserID) (tailcfg.UserProfileView, bool)
|
||||
}
|
||||
|
||||
// serveUserProfile returns the current [tailcfg.UserProfile] for the User
|
||||
// with the UserID given in the "id" query parameter, in O(1) time. It
|
||||
// returns 404 if no such user is in the current netmap.
|
||||
//
|
||||
// It is the LocalAPI fallback for IPN-bus consumers that see a UserID
|
||||
// referenced by a peer Node and want to resolve it to a UserProfile.
|
||||
func (h *Handler) serveUserProfile(w http.ResponseWriter, r *http.Request) {
|
||||
h.serveUserProfileWithBackend(w, r, h.b)
|
||||
}
|
||||
|
||||
func (h *Handler) serveUserProfileWithBackend(w http.ResponseWriter, r *http.Request, b userProfileBackend) {
|
||||
if !h.PermitRead {
|
||||
http.Error(w, "user-profile access denied", http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
idStr := r.FormValue("id")
|
||||
id, err := strconv.ParseInt(idStr, 10, 64)
|
||||
if err != nil || id <= 0 {
|
||||
http.Error(w, "invalid 'id' parameter", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
uv, ok := b.UserProfile(tailcfg.UserID(id))
|
||||
if !ok {
|
||||
http.Error(w, "no user with that UserID", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
e := json.NewEncoder(w)
|
||||
e.SetIndent("", "\t")
|
||||
e.Encode(uv.AsStruct())
|
||||
}
|
||||
|
||||
// serveSetExpirySooner sets the expiry date on the current machine, specified
|
||||
// by an `expiry` unix timestamp as POST or query param.
|
||||
func (h *Handler) serveSetExpirySooner(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
@@ -461,6 +461,66 @@ func TestServePeerByID(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
type fakeUserProfileBackend map[tailcfg.UserID]*tailcfg.UserProfile
|
||||
|
||||
func (f fakeUserProfileBackend) UserProfile(id tailcfg.UserID) (tailcfg.UserProfileView, bool) {
|
||||
u, ok := f[id]
|
||||
if !ok {
|
||||
return tailcfg.UserProfileView{}, false
|
||||
}
|
||||
return u.View(), true
|
||||
}
|
||||
|
||||
func TestServeUserProfile(t *testing.T) {
|
||||
h := handlerForTest(t, &Handler{PermitRead: true})
|
||||
b := fakeUserProfileBackend{
|
||||
7: {ID: 7, LoginName: "alice@example.com", DisplayName: "Alice"},
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
query string
|
||||
wantCode int
|
||||
wantLogin string
|
||||
}{
|
||||
{"hit", "id=7", 200, "alice@example.com"},
|
||||
{"miss", "id=99", 404, ""},
|
||||
{"bad_id", "id=garbage", 400, ""},
|
||||
{"missing_id", "", 400, ""},
|
||||
{"zero_id", "id=0", 400, ""},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest("GET", "/v0/user-profile?"+tt.query, nil)
|
||||
h.serveUserProfileWithBackend(rec, req, b)
|
||||
if rec.Code != tt.wantCode {
|
||||
t.Fatalf("status = %d, want %d; body=%q", rec.Code, tt.wantCode, rec.Body.String())
|
||||
}
|
||||
if tt.wantCode != 200 {
|
||||
return
|
||||
}
|
||||
var got tailcfg.UserProfile
|
||||
if err := json.Unmarshal(rec.Body.Bytes(), &got); err != nil {
|
||||
t.Fatalf("unmarshal body %q: %v", rec.Body.Bytes(), err)
|
||||
}
|
||||
if got.LoginName != tt.wantLogin {
|
||||
t.Errorf("LoginName = %q, want %q", got.LoginName, tt.wantLogin)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
t.Run("forbidden", func(t *testing.T) {
|
||||
hh := handlerForTest(t, &Handler{PermitRead: false})
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest("GET", "/v0/user-profile?id=7", nil)
|
||||
hh.serveUserProfileWithBackend(rec, req, b)
|
||||
if rec.Code != http.StatusForbidden {
|
||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusForbidden)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestShouldDenyServeConfigForGOOSAndUserContext(t *testing.T) {
|
||||
newHandler := func(connIsLocalAdmin bool) *Handler {
|
||||
return handlerForTest(t, &Handler{
|
||||
|
||||
Reference in New Issue
Block a user