X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d97388bdbfeb6a43cb86996012a1db0ba4a8871f..6fa46a69150cf4284988a65794b974c1cea6a46b:/lib/controller/handler.go diff --git a/lib/controller/handler.go b/lib/controller/handler.go index 53125ae554..4c6fca7f77 100644 --- a/lib/controller/handler.go +++ b/lib/controller/handler.go @@ -6,32 +6,38 @@ package controller import ( "context" - "database/sql" - "errors" - "net" + "fmt" "net/http" + "net/http/httptest" "net/url" "strings" "sync" - "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/health" - "git.curoverse.com/arvados.git/sdk/go/httpserver" + "git.arvados.org/arvados.git/lib/controller/api" + "git.arvados.org/arvados.git/lib/controller/federation" + "git.arvados.org/arvados.git/lib/controller/localdb" + "git.arvados.org/arvados.git/lib/controller/railsproxy" + "git.arvados.org/arvados.git/lib/controller/router" + "git.arvados.org/arvados.git/lib/ctrlctx" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/health" + "git.arvados.org/arvados.git/sdk/go/httpserver" + + // sqlx needs lib/pq to talk to PostgreSQL _ "github.com/lib/pq" ) type Handler struct { - Cluster *arvados.Cluster - NodeProfile *arvados.NodeProfile + Cluster *arvados.Cluster + BackgroundContext context.Context setupOnce sync.Once + federation *federation.Conn handlerStack http.Handler proxy *proxy secureClient *http.Client insecureClient *http.Client - pgdb *sql.DB - pgdbMtx sync.Mutex + dbConnector ctrlctx.DBConnector } func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { @@ -50,32 +56,86 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { req.URL.Path = strings.Replace(req.URL.Path, "//", "/", -1) } } - if h.Cluster.HTTPRequestTimeout > 0 { - ctx, cancel := context.WithDeadline(req.Context(), time.Now().Add(time.Duration(h.Cluster.HTTPRequestTimeout))) - req = req.WithContext(ctx) - defer cancel() - } - h.handlerStack.ServeHTTP(w, req) } func (h *Handler) CheckHealth() error { h.setupOnce.Do(h.setup) - _, _, err := findRailsAPI(h.Cluster, h.NodeProfile) - return err + _, err := h.dbConnector.GetDB(context.TODO()) + if err != nil { + return err + } + _, _, err = railsproxy.FindRailsAPI(h.Cluster) + if err != nil { + return err + } + if h.Cluster.API.VocabularyPath != "" { + req, err := http.NewRequest("GET", "/arvados/v1/vocabulary", nil) + if err != nil { + return err + } + var resp httptest.ResponseRecorder + h.handlerStack.ServeHTTP(&resp, req) + if resp.Result().StatusCode != http.StatusOK { + return fmt.Errorf("%d %s", resp.Result().StatusCode, resp.Result().Status) + } + } + return nil +} + +func (h *Handler) Done() <-chan struct{} { + return nil } func neverRedirect(*http.Request, []*http.Request) error { return http.ErrUseLastResponse } func (h *Handler) setup() { mux := http.NewServeMux() + healthFuncs := make(map[string]health.Func) + + h.dbConnector = ctrlctx.DBConnector{PostgreSQL: h.Cluster.PostgreSQL} + oidcAuthorizer := localdb.OIDCAccessTokenAuthorizer(h.Cluster, h.dbConnector.GetDB) + h.federation = federation.New(h.Cluster, &healthFuncs) + rtr := router.New(h.federation, router.Config{ + MaxRequestSize: h.Cluster.API.MaxRequestSize, + WrapCalls: api.ComposeWrappers( + ctrlctx.WrapCallsInTransactions(h.dbConnector.GetDB), + oidcAuthorizer.WrapCalls, + ctrlctx.WrapCallsWithAuth(h.Cluster)), + }) + + healthRoutes := health.Routes{"ping": func() error { _, err := h.dbConnector.GetDB(context.TODO()); return err }} + for name, f := range healthFuncs { + healthRoutes[name] = f + } mux.Handle("/_health/", &health.Handler{ Token: h.Cluster.ManagementToken, Prefix: "/_health/", + Routes: healthRoutes, }) + mux.Handle("/arvados/v1/config", rtr) + mux.Handle("/arvados/v1/vocabulary", rtr) + mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr) // must come before .../users/ + mux.Handle("/arvados/v1/collections", rtr) + mux.Handle("/arvados/v1/collections/", rtr) + mux.Handle("/arvados/v1/users", rtr) + mux.Handle("/arvados/v1/users/", rtr) + mux.Handle("/arvados/v1/connect/", rtr) + mux.Handle("/arvados/v1/container_requests", rtr) + mux.Handle("/arvados/v1/container_requests/", rtr) + mux.Handle("/arvados/v1/groups", rtr) + mux.Handle("/arvados/v1/groups/", rtr) + mux.Handle("/arvados/v1/links", rtr) + mux.Handle("/arvados/v1/links/", rtr) + mux.Handle("/login", rtr) + mux.Handle("/logout", rtr) + mux.Handle("/arvados/v1/api_client_authorizations", rtr) + mux.Handle("/arvados/v1/api_client_authorizations/", rtr) + hs := http.NotFoundHandler() hs = prepend(hs, h.proxyRailsAPI) hs = h.setupProxyRemoteCluster(hs) + hs = prepend(hs, oidcAuthorizer.Middleware) mux.Handle("/", hs) h.handlerStack = mux @@ -90,31 +150,9 @@ func (h *Handler) setup() { h.proxy = &proxy{ Name: "arvados-controller", } -} - -var errDBConnection = errors.New("database connection error") - -func (h *Handler) db(req *http.Request) (*sql.DB, error) { - h.pgdbMtx.Lock() - defer h.pgdbMtx.Unlock() - if h.pgdb != nil { - return h.pgdb, nil - } - db, err := sql.Open("postgres", h.Cluster.PostgreSQL.Connection.String()) - if err != nil { - httpserver.Logger(req).WithError(err).Error("postgresql connect failed") - return nil, errDBConnection - } - if p := h.Cluster.PostgreSQL.ConnectionPool; p > 0 { - db.SetMaxOpenConns(p) - } - if err := db.Ping(); err != nil { - httpserver.Logger(req).WithError(err).Error("postgresql connect succeeded but ping failed") - return nil, errDBConnection - } - h.pgdb = db - return db, nil + go h.trashSweepWorker() + go h.containerLogSweepWorker() } type middlewareFunc func(http.ResponseWriter, *http.Request, http.Handler) @@ -126,7 +164,7 @@ func prepend(next http.Handler, middleware middlewareFunc) http.Handler { } func (h *Handler) localClusterRequest(req *http.Request) (*http.Response, error) { - urlOut, insecure, err := findRailsAPI(h.Cluster, h.NodeProfile) + urlOut, insecure, err := railsproxy.FindRailsAPI(h.Cluster) if err != nil { return nil, err } @@ -152,22 +190,19 @@ func (h *Handler) proxyRailsAPI(w http.ResponseWriter, req *http.Request, next h } } -// For now, findRailsAPI always uses the rails API running on this -// node. -func findRailsAPI(cluster *arvados.Cluster, np *arvados.NodeProfile) (*url.URL, bool, error) { - hostport := np.RailsAPI.Listen - if len(hostport) > 1 && hostport[0] == ':' && strings.TrimRight(hostport[1:], "0123456789") == "" { - // ":12345" => connect to indicated port on localhost - hostport = "localhost" + hostport - } else if _, _, err := net.SplitHostPort(hostport); err == nil { - // "[::1]:12345" => connect to indicated address & port - } else { - return nil, false, err +// Use a localhost entry from Services.RailsAPI.InternalURLs if one is +// present, otherwise choose an arbitrary entry. +func findRailsAPI(cluster *arvados.Cluster) (*url.URL, bool, error) { + var best *url.URL + for target := range cluster.Services.RailsAPI.InternalURLs { + target := url.URL(target) + best = &target + if strings.HasPrefix(target.Host, "localhost:") || strings.HasPrefix(target.Host, "127.0.0.1:") || strings.HasPrefix(target.Host, "[::1]:") { + break + } } - proto := "http" - if np.RailsAPI.TLS { - proto = "https" + if best == nil { + return nil, false, fmt.Errorf("Services.RailsAPI.InternalURLs is empty") } - url, err := url.Parse(proto + "://" + hostport) - return url, np.RailsAPI.Insecure, err + return best, cluster.TLS.Insecure, nil }