X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0f644e242ef37c911ad3dc25aca8135c339de349..d6993a413a1290f110c52ed7339b09caf8b87b15:/services/keepstore/handlers.go diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go index f197196c41..2426c9cbda 100644 --- a/services/keepstore/handlers.go +++ b/services/keepstore/handlers.go @@ -4,13 +4,6 @@ package main -// REST handlers for Keep are implemented here. -// -// GetBlockHandler (GET /locator) -// PutBlockHandler (PUT /locator) -// IndexHandler (GET /index, GET /index/prefix) -// StatusHandler (GET /status.json) - import ( "container/list" "context" @@ -29,60 +22,74 @@ import ( "github.com/gorilla/mux" + "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.curoverse.com/arvados.git/sdk/go/health" "git.curoverse.com/arvados.git/sdk/go/httpserver" - log "github.com/Sirupsen/logrus" ) type router struct { *mux.Router - limiter httpserver.RequestCounter + limiter httpserver.RequestCounter + cluster *arvados.Cluster + remoteProxy remoteProxy } // MakeRESTRouter returns a new router that forwards all Keep requests // to the appropriate handlers. -func MakeRESTRouter() *router { - rest := mux.NewRouter() - rtr := &router{Router: rest} +func MakeRESTRouter(cluster *arvados.Cluster) http.Handler { + rtr := &router{ + Router: mux.NewRouter(), + cluster: cluster, + } - rest.HandleFunc( - `/{hash:[0-9a-f]{32}}`, GetBlockHandler).Methods("GET", "HEAD") - rest.HandleFunc( + rtr.HandleFunc( + `/{hash:[0-9a-f]{32}}`, rtr.handleGET).Methods("GET", "HEAD") + rtr.HandleFunc( `/{hash:[0-9a-f]{32}}+{hints}`, - GetBlockHandler).Methods("GET", "HEAD") + rtr.handleGET).Methods("GET", "HEAD") - rest.HandleFunc(`/{hash:[0-9a-f]{32}}`, PutBlockHandler).Methods("PUT") - rest.HandleFunc(`/{hash:[0-9a-f]{32}}`, DeleteHandler).Methods("DELETE") + rtr.HandleFunc(`/{hash:[0-9a-f]{32}}`, rtr.handlePUT).Methods("PUT") + rtr.HandleFunc(`/{hash:[0-9a-f]{32}}`, DeleteHandler).Methods("DELETE") // List all blocks stored here. Privileged client only. - rest.HandleFunc(`/index`, rtr.IndexHandler).Methods("GET", "HEAD") + rtr.HandleFunc(`/index`, rtr.IndexHandler).Methods("GET", "HEAD") // List blocks stored here whose hash has the given prefix. // Privileged client only. - rest.HandleFunc(`/index/{prefix:[0-9a-f]{0,32}}`, rtr.IndexHandler).Methods("GET", "HEAD") + rtr.HandleFunc(`/index/{prefix:[0-9a-f]{0,32}}`, rtr.IndexHandler).Methods("GET", "HEAD") // Internals/debugging info (runtime.MemStats) - rest.HandleFunc(`/debug.json`, rtr.DebugHandler).Methods("GET", "HEAD") + rtr.HandleFunc(`/debug.json`, rtr.DebugHandler).Methods("GET", "HEAD") // List volumes: path, device number, bytes used/avail. - rest.HandleFunc(`/status.json`, rtr.StatusHandler).Methods("GET", "HEAD") + rtr.HandleFunc(`/status.json`, rtr.StatusHandler).Methods("GET", "HEAD") // List mounts: UUID, readonly, tier, device ID, ... - rest.HandleFunc(`/mounts`, rtr.MountsHandler).Methods("GET") - rest.HandleFunc(`/mounts/{uuid}/blocks`, rtr.IndexHandler).Methods("GET") - rest.HandleFunc(`/mounts/{uuid}/blocks/`, rtr.IndexHandler).Methods("GET") + rtr.HandleFunc(`/mounts`, rtr.MountsHandler).Methods("GET") + rtr.HandleFunc(`/mounts/{uuid}/blocks`, rtr.IndexHandler).Methods("GET") + rtr.HandleFunc(`/mounts/{uuid}/blocks/`, rtr.IndexHandler).Methods("GET") // Replace the current pull queue. - rest.HandleFunc(`/pull`, PullHandler).Methods("PUT") + rtr.HandleFunc(`/pull`, PullHandler).Methods("PUT") // Replace the current trash queue. - rest.HandleFunc(`/trash`, TrashHandler).Methods("PUT") + rtr.HandleFunc(`/trash`, TrashHandler).Methods("PUT") // Untrash moves blocks from trash back into store - rest.HandleFunc(`/untrash/{hash:[0-9a-f]{32}}`, UntrashHandler).Methods("PUT") + rtr.HandleFunc(`/untrash/{hash:[0-9a-f]{32}}`, UntrashHandler).Methods("PUT") + + rtr.Handle("/_health/{check}", &health.Handler{ + Token: theConfig.ManagementToken, + Prefix: "/_health/", + }).Methods("GET") // Any request which does not match any of these routes gets // 400 Bad Request. - rest.NotFoundHandler = http.HandlerFunc(BadRequestHandler) + rtr.NotFoundHandler = http.HandlerFunc(BadRequestHandler) - return rtr + rtr.limiter = httpserver.NewRequestLimiter(theConfig.MaxRequests, rtr) + + stack := httpserver.Instrument(nil, nil, + httpserver.AddRequestIDs(httpserver.LogRequests(nil, rtr.limiter))) + return stack.ServeAPI(stack) } // BadRequestHandler is a HandleFunc to address bad requests. @@ -90,11 +97,16 @@ func BadRequestHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, BadRequestError.Error(), BadRequestError.HTTPCode) } -// GetBlockHandler is a HandleFunc to address Get block requests. -func GetBlockHandler(resp http.ResponseWriter, req *http.Request) { +func (rtr *router) handleGET(resp http.ResponseWriter, req *http.Request) { ctx, cancel := contextForResponse(context.TODO(), resp) defer cancel() + locator := req.URL.Path[1:] + if strings.Contains(locator, "+R") && !strings.Contains(locator, "+A") { + rtr.remoteProxy.Get(resp, req, rtr.cluster) + return + } + if theConfig.RequireSignatures { locator := req.URL.Path[1:] // strip leading slash if err := VerifySignature(locator, GetAPIToken(req)); err != nil { @@ -169,8 +181,7 @@ func getBufferWithContext(ctx context.Context, bufs *bufferPool, bufSize int) ([ } } -// PutBlockHandler is a HandleFunc to address Put block requests. -func PutBlockHandler(resp http.ResponseWriter, req *http.Request) { +func (rtr *router) handlePUT(resp http.ResponseWriter, req *http.Request) { ctx, cancel := contextForResponse(context.TODO(), resp) defer cancel() @@ -285,7 +296,7 @@ func (rtr *router) MountsHandler(resp http.ResponseWriter, req *http.Request) { // PoolStatus struct type PoolStatus struct { - Alloc uint64 `json:"BytesAllocated"` + Alloc uint64 `json:"BytesAllocatedCumulative"` Cap int `json:"BuffersMax"` Len int `json:"BuffersInUse"` } @@ -305,6 +316,7 @@ type NodeStatus struct { TrashQueue WorkQueueStatus RequestsCurrent int RequestsMax int + Version string } var st NodeStatus @@ -340,6 +352,7 @@ func (rtr *router) StatusHandler(resp http.ResponseWriter, req *http.Request) { // populate the given NodeStatus struct with current values. func (rtr *router) readNodeStatus(st *NodeStatus) { + st.Version = version vols := KeepVM.AllReadable() if cap(st.Volumes) < len(vols) { st.Volumes = make([]*volumeStatusEnt, len(vols)) @@ -498,7 +511,7 @@ type PullRequest struct { Servers []string `json:"servers"` // Destination mount, or "" for "anywhere" - MountUUID string + MountUUID string `json:"mount_uuid"` } // PullHandler processes "PUT /pull" requests for the data manager. @@ -531,13 +544,13 @@ func PullHandler(resp http.ResponseWriter, req *http.Request) { pullq.ReplaceQueue(plist) } -// TrashRequest consists of a block locator and it's Mtime +// TrashRequest consists of a block locator and its Mtime type TrashRequest struct { Locator string `json:"locator"` BlockMtime int64 `json:"block_mtime"` // Target mount, or "" for "everywhere" - MountUUID string + MountUUID string `json:"mount_uuid"` } // TrashHandler processes /trash requests. @@ -816,7 +829,7 @@ func IsValidLocator(loc string) bool { return validLocatorRe.MatchString(loc) } -var authRe = regexp.MustCompile(`^OAuth2\s+(.*)`) +var authRe = regexp.MustCompile(`^(OAuth2|Bearer)\s+(.*)`) // GetAPIToken returns the OAuth2 token from the Authorization // header of a HTTP request, or an empty string if no matching @@ -824,7 +837,7 @@ var authRe = regexp.MustCompile(`^OAuth2\s+(.*)`) func GetAPIToken(req *http.Request) string { if auth, ok := req.Header["Authorization"]; ok { if match := authRe.FindStringSubmatch(auth[0]); match != nil { - return match[1] + return match[2] } } return ""