X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fd5d197916b117386fbe872790ff6493326c4ea2..65b05a0f63dd137d680af4d98ae8d32dd2603158:/lib/controller/handler.go diff --git a/lib/controller/handler.go b/lib/controller/handler.go index 775d290347..4d4963413b 100644 --- a/lib/controller/handler.go +++ b/lib/controller/handler.go @@ -6,31 +6,35 @@ package controller import ( "context" - "database/sql" "errors" - "net" + "fmt" "net/http" "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/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/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/health" + "git.arvados.org/arvados.git/sdk/go/httpserver" + "github.com/jmoiron/sqlx" _ "github.com/lib/pq" ) type Handler struct { - Cluster *arvados.Cluster - NodeProfile *arvados.NodeProfile + Cluster *arvados.Cluster setupOnce sync.Once handlerStack http.Handler proxy *proxy secureClient *http.Client insecureClient *http.Client - pgdb *sql.DB + pgdb *sqlx.DB pgdbMtx sync.Mutex } @@ -50,8 +54,8 @@ 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))) + if h.Cluster.API.RequestTimeout > 0 { + ctx, cancel := context.WithDeadline(req.Context(), time.Now().Add(time.Duration(h.Cluster.API.RequestTimeout))) req = req.WithContext(ctx) defer cancel() } @@ -61,10 +65,18 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { func (h *Handler) CheckHealth() error { h.setupOnce.Do(h.setup) - _, _, err := findRailsAPI(h.Cluster, h.NodeProfile) + _, err := h.db(context.TODO()) + if err != nil { + return err + } + _, _, err = railsproxy.FindRailsAPI(h.Cluster) return err } +func (h *Handler) Done() <-chan struct{} { + return nil +} + func neverRedirect(*http.Request, []*http.Request) error { return http.ErrUseLastResponse } func (h *Handler) setup() { @@ -72,8 +84,22 @@ func (h *Handler) setup() { mux.Handle("/_health/", &health.Handler{ Token: h.Cluster.ManagementToken, Prefix: "/_health/", - Routes: health.Routes{"ping": func() error { _, err := h.db(&http.Request{}); return err }}, + Routes: health.Routes{"ping": func() error { _, err := h.db(context.TODO()); return err }}, }) + + rtr := router.New(federation.New(h.Cluster), localdb.WrapCallsInTransactions(h.db)) + mux.Handle("/arvados/v1/config", rtr) + mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr) + + if !h.Cluster.ForceLegacyAPI14 { + 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("/login", rtr) + mux.Handle("/logout", rtr) + } + hs := http.NotFoundHandler() hs = prepend(hs, h.proxyRailsAPI) hs = h.setupProxyRemoteCluster(hs) @@ -95,23 +121,23 @@ func (h *Handler) setup() { var errDBConnection = errors.New("database connection error") -func (h *Handler) db(req *http.Request) (*sql.DB, error) { +func (h *Handler) db(ctx context.Context) (*sqlx.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()) + db, err := sqlx.Open("postgres", h.Cluster.PostgreSQL.Connection.String()) if err != nil { - httpserver.Logger(req).WithError(err).Error("postgresql connect failed") + ctxlog.FromContext(ctx).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") + ctxlog.FromContext(ctx).WithError(err).Error("postgresql connect scuceeded but ping failed") return nil, errDBConnection } h.pgdb = db @@ -127,7 +153,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 } @@ -153,22 +179,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 }