X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0f644e242ef37c911ad3dc25aca8135c339de349..524c20020594ba67a2a822eccb632f8a5f5dc3ce:/services/keepstore/handlers.go

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index f197196c41..a84a84db3c 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -29,8 +29,8 @@ import (
 
 	"github.com/gorilla/mux"
 
+	"git.curoverse.com/arvados.git/sdk/go/health"
 	"git.curoverse.com/arvados.git/sdk/go/httpserver"
-	log "github.com/Sirupsen/logrus"
 )
 
 type router struct {
@@ -40,49 +40,63 @@ type router struct {
 
 // 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() http.Handler {
+	rtr := &router{Router: mux.NewRouter()}
 
-	rest.HandleFunc(
+	rtr.HandleFunc(
 		`/{hash:[0-9a-f]{32}}`, GetBlockHandler).Methods("GET", "HEAD")
-	rest.HandleFunc(
+	rtr.HandleFunc(
 		`/{hash:[0-9a-f]{32}}+{hints}`,
 		GetBlockHandler).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}}`, PutBlockHandler).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)
+
+	theConfig.metrics.setup()
+
+	rtr.limiter = httpserver.NewRequestLimiter(theConfig.MaxRequests, rtr)
+
+	mux := http.NewServeMux()
+	mux.Handle("/", theConfig.metrics.Instrument(
+		httpserver.AddRequestIDs(httpserver.LogRequests(rtr.limiter))))
+	mux.HandleFunc("/metrics.json", theConfig.metrics.exportJSON)
+	mux.Handle("/metrics", theConfig.metrics.exportProm)
 
-	return rtr
+	return mux
 }
 
 // BadRequestHandler is a HandleFunc to address bad requests.
@@ -285,7 +299,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 +319,7 @@ type NodeStatus struct {
 	TrashQueue      WorkQueueStatus
 	RequestsCurrent int
 	RequestsMax     int
+	Version         string
 }
 
 var st NodeStatus
@@ -340,6 +355,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 +514,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 +547,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.