TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: add server metric for batch write sizes

Browse Source 
Updates tailscale/corp#23668

Change-Id: Ie6268c4035a3b29fd53c072c5793e4cbba93d031
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-10-04 18:05:23 -07:00 committed by Brad Fitzpatrick
parent c588c36233
commit 38f236c725
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
derp/derp_server.go
View File

@ -145,6 +145,7 @@ type Server struct {
tcpRtt metrics.LabelMap // histogram tcpRtt metrics.LabelMap // histogram
meshUpdateBatchSize *metrics.Histogram meshUpdateBatchSize *metrics.Histogram
meshUpdateLoopCount *metrics.Histogram meshUpdateLoopCount *metrics.Histogram
bufferedWriteFrames *metrics.Histogram // how many sendLoop frames (or groups of related frames) get written per flush
// verifyClientsLocalTailscaled only accepts client connections to the DERP // verifyClientsLocalTailscaled only accepts client connections to the DERP
// server if the clientKey is a known peer in the network, as specified by a // server if the clientKey is a known peer in the network, as specified by a
@ -349,6 +350,7 @@ func NewServer(privateKey key.NodePrivate, logf logger.Logf) *Server {
tcpRtt: metrics.LabelMap{Label: "le"}, tcpRtt: metrics.LabelMap{Label: "le"},
meshUpdateBatchSize: metrics.NewHistogram([]float64{0, 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000}), meshUpdateBatchSize: metrics.NewHistogram([]float64{0, 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000}),
meshUpdateLoopCount: metrics.NewHistogram([]float64{0, 1, 2, 5, 10, 20, 50, 100}), meshUpdateLoopCount: metrics.NewHistogram([]float64{0, 1, 2, 5, 10, 20, 50, 100}),
bufferedWriteFrames: metrics.NewHistogram([]float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 50, 100}),
keyOfAddr: map[netip.AddrPort]key.NodePublic{}, keyOfAddr: map[netip.AddrPort]key.NodePublic{},
clock: tstime.StdClock{}, clock: tstime.StdClock{},
} }
@ -1653,10 +1655,12 @@ func (c *sclient) sendLoop(ctx context.Context) error {
defer keepAliveTick.Stop() defer keepAliveTick.Stop()
var werr error // last write error var werr error // last write error
inBatch := -1 // for bufferedWriteFrames
for { for {
if werr != nil { if werr != nil {
return werr return werr
} }
inBatch++
// First, a non-blocking select (with a default) that // First, a non-blocking select (with a default) that
// does as many non-flushing writes as possible. // does as many non-flushing writes as possible.
select { select {
@ -1688,6 +1692,10 @@ func (c *sclient) sendLoop(ctx context.Context) error {
if werr = c.bw.Flush(); werr != nil { if werr = c.bw.Flush(); werr != nil {
return werr return werr
} }
if inBatch != 0 { // the first loop will almost hit default & be size zero
c.s.bufferedWriteFrames.Observe(float64(inBatch))
inBatch = 0
}
} }
// Then a blocking select with same: // Then a blocking select with same:
@ -1698,7 +1706,6 @@ func (c *sclient) sendLoop(ctx context.Context) error {
werr = c.sendPeerGone(msg.peer, msg.reason) werr = c.sendPeerGone(msg.peer, msg.reason)
case <-c.meshUpdate: case <-c.meshUpdate:
werr = c.sendMeshUpdates() werr = c.sendMeshUpdates()
continue
case msg := <-c.sendQueue: case msg := <-c.sendQueue:
werr = c.sendPacket(msg.src, msg.bs) werr = c.sendPacket(msg.src, msg.bs)
c.recordQueueTime(msg.enqueuedAt) c.recordQueueTime(msg.enqueuedAt)
@ -1707,7 +1714,6 @@ func (c *sclient) sendLoop(ctx context.Context) error {
c.recordQueueTime(msg.enqueuedAt) c.recordQueueTime(msg.enqueuedAt)
case msg := <-c.sendPongCh: case msg := <-c.sendPongCh:
werr = c.sendPong(msg) werr = c.sendPong(msg)
continue
case <-keepAliveTickChannel: case <-keepAliveTickChannel:
werr = c.sendKeepAlive() werr = c.sendKeepAlive()
} }
@ -2060,6 +2066,7 @@ func (s *Server) ExpVar() expvar.Var {
m.Set("counter_tcp_rtt", &s.tcpRtt) m.Set("counter_tcp_rtt", &s.tcpRtt)
m.Set("counter_mesh_update_batch_size", s.meshUpdateBatchSize) m.Set("counter_mesh_update_batch_size", s.meshUpdateBatchSize)
m.Set("counter_mesh_update_loop_count", s.meshUpdateLoopCount) m.Set("counter_mesh_update_loop_count", s.meshUpdateLoopCount)
m.Set("counter_buffered_write_frames", s.bufferedWriteFrames)
var expvarVersion expvar.String var expvarVersion expvar.String
expvarVersion.Set(version.Long()) expvarVersion.Set(version.Long())
m.Set("version", &expvarVersion) m.Set("version", &expvarVersion)