+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
+ "git.curoverse.com/arvados.git/sdk/go/stats"
)
type handler struct {
QueueSize int
mtx sync.Mutex
- queues map[chan interface{}]struct{}
+ lastDelay map[chan interface{}]stats.Duration
setupOnce sync.Once
}
EventCount uint64
}
-func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsConn, chan<- interface{}) (session, error)) (stats handlerStats) {
+func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsConn, chan<- interface{}) (session, error)) (hStats handlerStats) {
h.setupOnce.Do(h.setup)
ctx, cancel := context.WithCancel(ws.Request().Context())
+ defer cancel()
log := logger(ctx)
incoming := eventSource.NewSink()
queue := make(chan interface{}, h.QueueSize)
h.mtx.Lock()
- h.queues[queue] = struct{}{}
+ h.lastDelay[queue] = 0
h.mtx.Unlock()
defer func() {
h.mtx.Lock()
- delete(h.queues, queue)
+ delete(h.lastDelay, queue)
h.mtx.Unlock()
}()
return
}
+ // Receive websocket frames from the client and pass them to
+ // sess.Receive().
go func() {
+ defer cancel()
buf := make([]byte, 2<<20)
for {
select {
err = errFrameTooBig
}
if err != nil {
- if err != io.EOF {
+ if err != io.EOF && ctx.Err() == nil {
log.WithError(err).Info("read error")
}
- cancel()
return
}
err = sess.Receive(buf)
if err != nil {
log.WithError(err).Error("sess.Receive() failed")
- cancel()
return
}
}
}()
+ // Take items from the outgoing queue, serialize them using
+ // sess.EventMessage() as needed, and send them to the client
+ // as websocket frames.
go func() {
+ defer cancel()
for {
var ok bool
var data interface{}
buf, err = sess.EventMessage(e)
if err != nil {
log.WithError(err).Error("EventMessage failed")
- cancel()
- break
+ return
} else if len(buf) == 0 {
log.Debug("skip")
continue
t0 := time.Now()
_, err = ws.Write(buf)
if err != nil {
- log.WithError(err).Error("write failed")
- cancel()
- break
+ if ctx.Err() == nil {
+ log.WithError(err).Error("write failed")
+ }
+ return
}
log.Debug("sent")
if e != nil {
- stats.QueueDelayNs += t0.Sub(e.Received)
+ hStats.QueueDelayNs += t0.Sub(e.Ready)
+ h.mtx.Lock()
+ h.lastDelay[queue] = stats.Duration(time.Since(e.Ready))
+ h.mtx.Unlock()
}
- stats.WriteDelayNs += time.Since(t0)
- stats.EventBytes += uint64(len(buf))
- stats.EventCount++
+ hStats.WriteDelayNs += time.Since(t0)
+ hStats.EventBytes += uint64(len(buf))
+ hStats.EventCount++
}
}()
// is done/cancelled or the incoming event stream ends. Shut
// down the handler if the outgoing queue fills up.
go func() {
+ defer cancel()
ticker := time.NewTicker(h.PingTimeout)
defer ticker.Stop()
default:
}
}
- continue
case e, ok := <-incoming.Channel():
if !ok {
- cancel()
return
}
if !sess.Filter(e) {
case queue <- e:
default:
log.WithError(errQueueFull).Error("terminate")
- cancel()
return
}
}
return
}
-func (h *handler) Status() interface{} {
+func (h *handler) DebugStatus() interface{} {
h.mtx.Lock()
defer h.mtx.Unlock()
var s struct {
- QueueCount int
- QueueMax int
- QueueTotal uint64
+ QueueCount int
+ QueueMin int
+ QueueMax int
+ QueueTotal uint64
+ QueueDelayMin stats.Duration
+ QueueDelayMax stats.Duration
}
- for q := range h.queues {
+ for q, lastDelay := range h.lastDelay {
+ s.QueueCount++
n := len(q)
s.QueueTotal += uint64(n)
if s.QueueMax < n {
s.QueueMax = n
}
+ if s.QueueMin > n || s.QueueCount == 1 {
+ s.QueueMin = n
+ }
+ if (s.QueueDelayMin > lastDelay || s.QueueDelayMin == 0) && lastDelay > 0 {
+ s.QueueDelayMin = lastDelay
+ }
+ if s.QueueDelayMax < lastDelay {
+ s.QueueDelayMax = lastDelay
+ }
}
- s.QueueCount = len(h.queues)
return &s
}
func (h *handler) setup() {
- h.queues = make(map[chan interface{}]struct{})
+ h.lastDelay = make(map[chan interface{}]stats.Duration)
}