Merge branch '18941-arv-prefetch' refs #18941

[arvados.git] / services / ws / router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index 30f93eab3aeb301f23668b93a3cc8994bcd992c8..878c282f8a6c57f17192b777faba760485757b86 100644 (file)
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -1,49 +1,98 @@
-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package ws
 
 import (
-       "encoding/json"
-       "fmt"
-       "log"
+       "io"
        "net/http"
        "sync"
+       "sync/atomic"
+       "time"
 
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/ctxlog"
+       "git.arvados.org/arvados.git/sdk/go/health"
+       "github.com/prometheus/client_golang/prometheus"
+       "github.com/sirupsen/logrus"
        "golang.org/x/net/websocket"
 )
 
+type wsConn interface {
+       io.ReadWriter
+       Request() *http.Request
+       SetReadDeadline(time.Time) error
+       SetWriteDeadline(time.Time) error
+}
+
 type router struct {
-       Config *Config
+       client         *arvados.Client
+       cluster        *arvados.Cluster
+       eventSource    eventSource
+       newPermChecker func() permChecker
 
-       eventSource eventSource
-       mux         *http.ServeMux
-       setupOnce   sync.Once
+       handler   *handler
+       mux       *http.ServeMux
+       setupOnce sync.Once
+       done      chan struct{}
+       reg       *prometheus.Registry
 }
 
 func (rtr *router) setup() {
+       mSockets := prometheus.NewGaugeVec(prometheus.GaugeOpts{
+               Namespace: "arvados",
+               Subsystem: "ws",
+               Name:      "sockets",
+               Help:      "Number of connected sockets",
+       }, []string{"version"})
+       rtr.reg.MustRegister(mSockets)
+
+       rtr.handler = &handler{
+               PingTimeout: time.Duration(rtr.cluster.API.SendTimeout),
+               QueueSize:   rtr.cluster.API.WebsocketClientEventQueue,
+       }
        rtr.mux = http.NewServeMux()
-       rtr.mux.Handle("/websocket", rtr.makeServer(&handlerV0{
-               Client:      rtr.Config.Client,
-               PingTimeout: rtr.Config.PingTimeout.Duration(),
-               QueueSize:   rtr.Config.ClientEventQueue,
-       }))
-       rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(&handlerV1{
-               Client:      rtr.Config.Client,
-               PingTimeout: rtr.Config.PingTimeout.Duration(),
-               QueueSize:   rtr.Config.ClientEventQueue,
-       }))
+       rtr.mux.Handle("/websocket", rtr.makeServer(newSessionV0, mSockets.WithLabelValues("0")))
+       rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(newSessionV1, mSockets.WithLabelValues("1")))
+       rtr.mux.Handle("/_health/", &health.Handler{
+               Token:  rtr.cluster.ManagementToken,
+               Prefix: "/_health/",
+               Routes: health.Routes{
+                       "db": rtr.eventSource.DBHealth,
+               },
+               Log: func(r *http.Request, err error) {
+                       if err != nil {
+                               ctxlog.FromContext(r.Context()).WithError(err).Error("error")
+                       }
+               },
+       })
 }
 
-func (rtr *router) makeServer(handler handler) *websocket.Server {
+func (rtr *router) makeServer(newSession sessionFactory, gauge prometheus.Gauge) *websocket.Server {
+       var connected int64
        return &websocket.Server{
                Handshake: func(c *websocket.Config, r *http.Request) error {
                        return nil
                },
                Handler: websocket.Handler(func(ws *websocket.Conn) {
-                       log.Printf("%v accepted", ws.Request().RemoteAddr)
-                       sink := rtr.eventSource.NewSink()
-                       handler.Handle(ws, sink.Channel())
-                       sink.Stop()
+                       t0 := time.Now()
+                       logger := ctxlog.FromContext(ws.Request().Context())
+                       atomic.AddInt64(&connected, 1)
+                       gauge.Set(float64(atomic.LoadInt64(&connected)))
+
+                       stats := rtr.handler.Handle(ws, logger, rtr.eventSource,
+                               func(ws wsConn, sendq chan<- interface{}) (session, error) {
+                                       return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker(), rtr.client)
+                               })
+
+                       logger.WithFields(logrus.Fields{
+                               "elapsed": time.Now().Sub(t0).Seconds(),
+                               "stats":   stats,
+                       }).Info("client disconnected")
                        ws.Close()
-                       log.Printf("%v disconnected", ws.Request().RemoteAddr)
+                       atomic.AddInt64(&connected, -1)
+                       gauge.Set(float64(atomic.LoadInt64(&connected)))
                }),
        }
 }
@@ -51,11 +100,13 @@ func (rtr *router) makeServer(handler handler) *websocket.Server {
 func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
        rtr.setupOnce.Do(rtr.setup)
        rtr.mux.ServeHTTP(resp, req)
-       j, err := json.Marshal(map[string]interface{}{
-               "req": fmt.Sprintf("%+v", req),
-       })
-       if err != nil {
-               log.Fatal(err)
-       }
-       log.Print(string(j))
+}
+
+func (rtr *router) CheckHealth() error {
+       rtr.setupOnce.Do(rtr.setup)
+       return rtr.eventSource.DBHealth()
+}
+
+func (rtr *router) Done() <-chan struct{} {
+       return rtr.done
 }