-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package ws
import (
- "database/sql"
"encoding/json"
"io"
"net/http"
"sync/atomic"
"time"
- "github.com/Sirupsen/logrus"
+ "git.arvados.org/arvados.git/lib/cmd"
+ "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/sirupsen/logrus"
"golang.org/x/net/websocket"
)
}
type router struct {
- Config *Config
+ client *arvados.Client
+ cluster *arvados.Cluster
eventSource eventSource
newPermChecker func() permChecker
+ handler *handler
mux *http.ServeMux
setupOnce sync.Once
lastReqID int64
lastReqMtx sync.Mutex
- status routerStatus
+ status routerDebugStatus
}
-type routerStatus struct {
- Connections int64
+type routerDebugStatus struct {
+ ReqsReceived int64
+ ReqsActive int64
}
-type Statuser interface {
- Status() interface{}
+type debugStatuser interface {
+ DebugStatus() interface{}
}
-type sessionFactory func(wsConn, chan<- interface{}, *sql.DB, permChecker) (session, error)
-
func (rtr *router) setup() {
+ 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(NewSessionV0))
- rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(NewSessionV1))
- rtr.mux.HandleFunc("/status.json", rtr.serveStatus)
+ rtr.mux.Handle("/websocket", rtr.makeServer(newSessionV0))
+ rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(newSessionV1))
+ rtr.mux.Handle("/debug.json", rtr.jsonHandler(rtr.DebugStatus))
+ rtr.mux.Handle("/status.json", rtr.jsonHandler(rtr.Status))
+
+ 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(newSession sessionFactory) *websocket.Server {
- handler := &handler{
- PingTimeout: rtr.Config.PingTimeout.Duration(),
- QueueSize: rtr.Config.ClientEventQueue,
- NewSession: func(ws wsConn, sendq chan<- interface{}) (session, error) {
- return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker())
- },
- }
return &websocket.Server{
Handshake: func(c *websocket.Config, r *http.Request) error {
return nil
},
Handler: websocket.Handler(func(ws *websocket.Conn) {
t0 := time.Now()
- sink := rtr.eventSource.NewSink()
- log := logger(ws.Request().Context())
- log.Info("connected")
+ logger := ctxlog.FromContext(ws.Request().Context())
+ logger.Info("connected")
- stats := handler.Handle(ws, sink.Channel())
+ 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)
+ })
- log.WithFields(logrus.Fields{
- "Elapsed": time.Now().Sub(t0).Seconds(),
- "Stats": stats,
+ logger.WithFields(logrus.Fields{
+ "elapsed": time.Now().Sub(t0).Seconds(),
+ "stats": stats,
}).Info("disconnect")
- sink.Stop()
ws.Close()
}),
}
return strconv.FormatInt(id, 36)
}
-func (rtr *router) Status() interface{} {
+func (rtr *router) DebugStatus() interface{} {
s := map[string]interface{}{
- "Router": rtr.status,
+ "HTTP": rtr.status,
+ "Outgoing": rtr.handler.DebugStatus(),
}
- if es, ok := rtr.eventSource.(Statuser); ok {
- s["EventSource"] = es.Status()
+ if es, ok := rtr.eventSource.(debugStatuser); ok {
+ s["EventSource"] = es.DebugStatus()
}
return s
}
-func (rtr *router) serveStatus(resp http.ResponseWriter, req *http.Request) {
- rtr.setupOnce.Do(rtr.setup)
- logger := logger(req.Context())
- logger.Debug("status")
- enc := json.NewEncoder(resp)
- err := enc.Encode(rtr.Status())
- if err != nil {
- logger.WithError(err).Error("status encode failed")
+func (rtr *router) Status() interface{} {
+ return map[string]interface{}{
+ "Clients": atomic.LoadInt64(&rtr.status.ReqsActive),
+ "Version": cmd.Version.String(),
}
}
func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
rtr.setupOnce.Do(rtr.setup)
- atomic.AddInt64(&rtr.status.Connections, 1)
- defer atomic.AddInt64(&rtr.status.Connections, -1)
+ atomic.AddInt64(&rtr.status.ReqsReceived, 1)
+ atomic.AddInt64(&rtr.status.ReqsActive, 1)
+ defer atomic.AddInt64(&rtr.status.ReqsActive, -1)
- logger := logger(req.Context()).
+ logger := ctxlog.FromContext(req.Context()).
WithField("RequestID", rtr.newReqID())
- ctx := contextWithLogger(req.Context(), logger)
+ ctx := ctxlog.Context(req.Context(), logger)
req = req.WithContext(ctx)
logger.WithFields(logrus.Fields{
- "RemoteAddr": req.RemoteAddr,
- "X-Forwarded-For": req.Header.Get("X-Forwarded-For"),
+ "remoteAddr": req.RemoteAddr,
+ "reqForwardedFor": req.Header.Get("X-Forwarded-For"),
}).Info("accept request")
rtr.mux.ServeHTTP(resp, req)
}
+
+func (rtr *router) jsonHandler(fn func() interface{}) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ logger := ctxlog.FromContext(r.Context())
+ w.Header().Set("Content-Type", "application/json")
+ enc := json.NewEncoder(w)
+ err := enc.Encode(fn())
+ if err != nil {
+ msg := "encode failed"
+ logger.WithError(err).Error(msg)
+ http.Error(w, msg, http.StatusInternalServerError)
+ }
+ })
+}
+
+func (rtr *router) CheckHealth() error {
+ rtr.setupOnce.Do(rtr.setup)
+ return rtr.eventSource.DBHealth()
+}
projects / arvados.git / blobdiff