mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-05 12:16:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

health: always include control health messages in the current state

Browse Source 
(*health.Tracker).CurrentState() returns an empty state when there are no client-side
warnables, even when there are control-health messages, which is incorrect.

This fixes it.

Updates tailscale/corp#37275

Signed-off-by: Nick Khyl <nickk@tailscale.com>
This commit is contained in:
Nick Khyl 2026-02-13 12:51:51 -06:00 committed by Nick Khyl
parent 4f1406f05a
commit 3cc7f897d3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
health/state.go
View File

@ -11,6 +11,7 @@ import (
"tailscale.com/feature/buildfeatures"
"tailscale.com/tailcfg"
"tailscale.com/util/mak"
)
// State contains the health status of the backend, and is
@ -128,11 +129,7 @@ func (t *Tracker) CurrentState() *State {
t.mu.Lock()
defer t.mu.Unlock()
if t.warnableVal == nil || len(t.warnableVal) == 0 {
return &State{}
}
wm := map[WarnableCode]UnhealthyState{}
var wm map[WarnableCode]UnhealthyState
for w, ws := range t.warnableVal {
if !w.IsVisible(ws, t.now) {
@ -145,7 +142,7 @@ func (t *Tracker) CurrentState() *State {
continue
}
state := w.unhealthyState(ws)
wm[w.Code] = state.withETag()
mak.Set(&wm, w.Code, state.withETag())
}
for id, msg := range t.lastNotifiedControlMessages {
@ -165,7 +162,7 @@ func (t *Tracker) CurrentState() *State {
}
}
wm[state.WarnableCode] = state.withETag()
mak.Set(&wm, state.WarnableCode, state.withETag())
}
return &State{