TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-22 21:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

appc: log how many routes are being written

Browse Source 
So that we can debug customer problems more easily.

Updates #11008

Signed-off-by: Fran Bull <fran@tailscale.com>
This commit is contained in:
Fran Bull 2024-06-07 10:29:47 -07:00 committed by franbull
parent 807934f00c
commit ba46495e11
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
appc/appconnector.go
View File

@ -35,7 +35,7 @@ type rateLogger struct {
periodStart time.Time periodStart time.Time
periodCount int64 periodCount int64
now func() time.Time now func() time.Time
callback func(int64, time.Time) callback func(int64, time.Time, int64)
} }
func (rl *rateLogger) currentIntervalStart(now time.Time) time.Time { func (rl *rateLogger) currentIntervalStart(now time.Time) time.Time {
@ -43,12 +43,12 @@ func (rl *rateLogger) currentIntervalStart(now time.Time) time.Time {
return now.Add(-(time.Duration(millisSince)) * time.Millisecond) return now.Add(-(time.Duration(millisSince)) * time.Millisecond)
} }
func (rl *rateLogger) update() { func (rl *rateLogger) update(numRoutes int64) {
now := rl.now() now := rl.now()
periodEnd := rl.periodStart.Add(rl.interval) periodEnd := rl.periodStart.Add(rl.interval)
if periodEnd.Before(now) { if periodEnd.Before(now) {
if rl.periodCount != 0 { if rl.periodCount != 0 {
rl.callback(rl.periodCount, rl.periodStart) rl.callback(rl.periodCount, rl.periodStart, numRoutes)
} }
rl.periodCount = 0 rl.periodCount = 0
rl.periodStart = rl.currentIntervalStart(now) rl.periodStart = rl.currentIntervalStart(now)
@ -56,7 +56,7 @@ func (rl *rateLogger) update() {
rl.periodCount++ rl.periodCount++
} }
func newRateLogger(now func() time.Time, interval time.Duration, callback func(int64, time.Time)) *rateLogger { func newRateLogger(now func() time.Time, interval time.Duration, callback func(int64, time.Time, int64)) *rateLogger {
nowTime := now() nowTime := now()
return &rateLogger{ return &rateLogger{
callback: callback, callback: callback,
@ -139,11 +139,11 @@ func NewAppConnector(logf logger.Logf, routeAdvertiser RouteAdvertiser, routeInf
ac.wildcards = routeInfo.Wildcards ac.wildcards = routeInfo.Wildcards
ac.controlRoutes = routeInfo.Control ac.controlRoutes = routeInfo.Control
} }
ac.writeRateMinute = newRateLogger(time.Now, time.Minute, func(c int64, s time.Time) { ac.writeRateMinute = newRateLogger(time.Now, time.Minute, func(c int64, s time.Time, l int64) {
ac.logf("routeInfo write rate: %d in minute starting at %v", c, s) ac.logf("routeInfo write rate: %d in minute starting at %v (%d routes)", c, s, l)
}) })
ac.writeRateDay = newRateLogger(time.Now, 24*time.Hour, func(c int64, s time.Time) { ac.writeRateDay = newRateLogger(time.Now, 24*time.Hour, func(c int64, s time.Time, l int64) {
ac.logf("routeInfo write rate: %d in 24 hours starting at %v", c, s) ac.logf("routeInfo write rate: %d in 24 hours starting at %v (%d routes)", c, s, l)
}) })
return ac return ac
} }
@ -159,8 +159,15 @@ func (e *AppConnector) storeRoutesLocked() error {
if !e.ShouldStoreRoutes() { if !e.ShouldStoreRoutes() {
return nil return nil
} }
e.writeRateMinute.update()
e.writeRateDay.update() // log write rate and write size
numRoutes := int64(len(e.controlRoutes))
for _, rs := range e.domains {
numRoutes += int64(len(rs))
}
e.writeRateMinute.update(numRoutes)
e.writeRateDay.update(numRoutes)
return e.storeRoutesFunc(&RouteInfo{ return e.storeRoutesFunc(&RouteInfo{
Control: e.controlRoutes, Control: e.controlRoutes,
Domains: e.domains, Domains: e.domains,

12
appc/appconnector_test.go
View File

@ -526,7 +526,7 @@ func TestRoutesWithout(t *testing.T) {
func TestRateLogger(t *testing.T) { func TestRateLogger(t *testing.T) {
clock := tstest.Clock{} clock := tstest.Clock{}
wasCalled := false wasCalled := false
rl := newRateLogger(func() time.Time { return clock.Now() }, 1*time.Second, func(count int64, _ time.Time) { rl := newRateLogger(func() time.Time { return clock.Now() }, 1*time.Second, func(count int64, _ time.Time, _ int64) {
if count != 3 { if count != 3 {
t.Fatalf("count for prev period: got %d, want 3", count) t.Fatalf("count for prev period: got %d, want 3", count)
} }
@ -535,20 +535,20 @@ func TestRateLogger(t *testing.T) {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
clock.Advance(1 * time.Millisecond) clock.Advance(1 * time.Millisecond)
rl.update() rl.update(0)
if wasCalled { if wasCalled {
t.Fatalf("wasCalled: got true, want false") t.Fatalf("wasCalled: got true, want false")
} }
} }
clock.Advance(1 * time.Second) clock.Advance(1 * time.Second)
rl.update() rl.update(0)
if !wasCalled { if !wasCalled {
t.Fatalf("wasCalled: got false, want true") t.Fatalf("wasCalled: got false, want true")
} }
wasCalled = false wasCalled = false
rl = newRateLogger(func() time.Time { return clock.Now() }, 1*time.Hour, func(count int64, _ time.Time) { rl = newRateLogger(func() time.Time { return clock.Now() }, 1*time.Hour, func(count int64, _ time.Time, _ int64) {
if count != 3 { if count != 3 {
t.Fatalf("count for prev period: got %d, want 3", count) t.Fatalf("count for prev period: got %d, want 3", count)
} }
@ -557,14 +557,14 @@ func TestRateLogger(t *testing.T) {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
clock.Advance(1 * time.Minute) clock.Advance(1 * time.Minute)
rl.update() rl.update(0)
if wasCalled { if wasCalled {
t.Fatalf("wasCalled: got true, want false") t.Fatalf("wasCalled: got true, want false")
} }
} }
clock.Advance(1 * time.Hour) clock.Advance(1 * time.Hour)
rl.update() rl.update(0)
if !wasCalled { if !wasCalled {
t.Fatalf("wasCalled: got false, want true") t.Fatalf("wasCalled: got false, want true")
} }