X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8c014223e42683d308798475c021bad7a794e998..a4166f402b34e018940ae1df726351e8c52ac1c1:/services/ws/handler.go

diff --git a/services/ws/handler.go b/services/ws/handler.go
index dace39be35..d527c39ba1 100644
--- a/services/ws/handler.go
+++ b/services/ws/handler.go
@@ -1,13 +1,17 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"sync"
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/stats"
 )
 
 type handler struct {
@@ -16,7 +20,7 @@ type handler struct {
 	QueueSize   int
 
 	mtx       sync.Mutex
-	lastDelay map[chan interface{}]time.Duration
+	lastDelay map[chan interface{}]stats.Duration
 	setupOnce sync.Once
 }
 
@@ -27,10 +31,11 @@ type handlerStats struct {
 	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()
@@ -52,7 +57,10 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 		return
 	}
 
+	// Receive websocket frames from the client and pass them to
+	// sess.Receive().
 	go func() {
+		defer cancel()
 		buf := make([]byte, 2<<20)
 		for {
 			select {
@@ -68,22 +76,24 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 				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{}
@@ -109,8 +119,7 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 				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
@@ -125,21 +134,22 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 			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.Ready)
+				hStats.QueueDelayNs += t0.Sub(e.Ready)
 				h.mtx.Lock()
-				h.lastDelay[queue] = time.Since(e.Ready)
+				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++
 		}
 	}()
 
@@ -149,6 +159,7 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 	// 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()
 
@@ -168,10 +179,8 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 					default:
 					}
 				}
-				continue
 			case e, ok := <-incoming.Channel():
 				if !ok {
-					cancel()
 					return
 				}
 				if !sess.Filter(e) {
@@ -181,7 +190,6 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 				case queue <- e:
 				default:
 					log.WithError(errQueueFull).Error("terminate")
-					cancel()
 					return
 				}
 			}
@@ -192,7 +200,7 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
 	return
 }
 
-func (h *handler) Status() interface{} {
+func (h *handler) DebugStatus() interface{} {
 	h.mtx.Lock()
 	defer h.mtx.Unlock()
 
@@ -201,10 +209,8 @@ func (h *handler) Status() interface{} {
 		QueueMin      int
 		QueueMax      int
 		QueueTotal    uint64
-		queueDelayMin time.Duration
-		QueueDelayMin string
-		queueDelayMax time.Duration
-		QueueDelayMax string
+		QueueDelayMin stats.Duration
+		QueueDelayMax stats.Duration
 	}
 	for q, lastDelay := range h.lastDelay {
 		s.QueueCount++
@@ -216,18 +222,16 @@ func (h *handler) Status() interface{} {
 		if s.QueueMin > n || s.QueueCount == 1 {
 			s.QueueMin = n
 		}
-		if (s.queueDelayMin > lastDelay || s.queueDelayMin == 0) && lastDelay > 0 {
-			s.queueDelayMin = lastDelay
+		if (s.QueueDelayMin > lastDelay || s.QueueDelayMin == 0) && lastDelay > 0 {
+			s.QueueDelayMin = lastDelay
 		}
-		if s.queueDelayMax < lastDelay {
-			s.queueDelayMax = lastDelay
+		if s.QueueDelayMax < lastDelay {
+			s.QueueDelayMax = lastDelay
 		}
 	}
-	s.QueueDelayMin = fmt.Sprintf("%.06f", s.queueDelayMin.Seconds())
-	s.QueueDelayMax = fmt.Sprintf("%.06f", s.queueDelayMax.Seconds())
 	return &s
 }
 
 func (h *handler) setup() {
-	h.lastDelay = make(map[chan interface{}]time.Duration)
+	h.lastDelay = make(map[chan interface{}]stats.Duration)
 }