X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6fb784416db6651b33b921a0684c2f8de84410fc..38de76ceaabe6f1b522a538a27dfeb2f58c5fb69:/services/keepstore/handlers.go diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go index 289dce15a0..33561426f9 100644 --- a/services/keepstore/handlers.go +++ b/services/keepstore/handlers.go @@ -13,9 +13,7 @@ import ( "crypto/md5" "encoding/json" "fmt" - "github.com/gorilla/mux" "io" - "log" "net/http" "os" "regexp" @@ -24,13 +22,23 @@ import ( "strings" "sync" "time" + + "github.com/gorilla/mux" + + "git.curoverse.com/arvados.git/sdk/go/httpserver" + log "github.com/Sirupsen/logrus" ) -// MakeRESTRouter returns a new mux.Router that forwards all Keep -// requests to the appropriate handlers. -// -func MakeRESTRouter() *mux.Router { +type router struct { + *mux.Router + limiter httpserver.RequestCounter +} + +// MakeRESTRouter returns a new router that forwards all Keep requests +// to the appropriate handlers. +func MakeRESTRouter() *router { rest := mux.NewRouter() + rtr := &router{Router: rest} rest.HandleFunc( `/{hash:[0-9a-f]{32}}`, GetBlockHandler).Methods("GET", "HEAD") @@ -46,8 +54,16 @@ func MakeRESTRouter() *mux.Router { // Privileged client only. rest.HandleFunc(`/index/{prefix:[0-9a-f]{0,32}}`, IndexHandler).Methods("GET", "HEAD") + // Internals/debugging info (runtime.MemStats) + rest.HandleFunc(`/debug.json`, rtr.DebugHandler).Methods("GET", "HEAD") + // List volumes: path, device number, bytes used/avail. - rest.HandleFunc(`/status.json`, StatusHandler).Methods("GET", "HEAD") + rest.HandleFunc(`/status.json`, rtr.StatusHandler).Methods("GET", "HEAD") + + // List mounts: UUID, readonly, tier, device ID, ... + rest.HandleFunc(`/mounts`, rtr.Mounts).Methods("GET") + rest.HandleFunc(`/mounts/{uuid}/blocks`, rtr.MountBlocks).Methods("GET") + rest.HandleFunc(`/mounts/{uuid}/blocks/{prefix:[0-9a-f]{0,32}}`, rtr.MountBlocks).Methods("GET") // Replace the current pull queue. rest.HandleFunc(`/pull`, PullHandler).Methods("PUT") @@ -62,7 +78,7 @@ func MakeRESTRouter() *mux.Router { // 400 Bad Request. rest.NotFoundHandler = http.HandlerFunc(BadRequestHandler) - return rest + return rtr } // BadRequestHandler is a HandleFunc to address bad requests. @@ -239,17 +255,31 @@ func IndexHandler(resp http.ResponseWriter, req *http.Request) { resp.Write([]byte{'\n'}) } -// StatusHandler -// Responds to /status.json requests with the current node status, -// described in a JSON structure. -// -// The data given in a status.json response includes: -// volumes - a list of Keep volumes currently in use by this server -// each volume is an object with the following fields: -// * mount_point -// * device_num (an integer identifying the underlying filesystem) -// * bytes_free -// * bytes_used +// Mounts responds to "GET /mounts" requests. +func (rtr *router) Mounts(resp http.ResponseWriter, req *http.Request) { + err := json.NewEncoder(resp).Encode(KeepVM.Mounts()) + if err != nil { + http.Error(resp, err.Error(), http.StatusInternalServerError) + } +} + +// MountBlocks responds to "GET /mounts/{uuid}/blocks" requests. +func (rtr *router) MountBlocks(resp http.ResponseWriter, req *http.Request) { + if !IsSystemAuth(GetAPIToken(req)) { + http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode) + return + } + + uuid := mux.Vars(req)["uuid"] + prefix := mux.Vars(req)["prefix"] + if v := KeepVM.Lookup(uuid, false); v == nil { + http.Error(resp, "mount not found", http.StatusNotFound) + } else if err := v.IndexTo(prefix, resp); err != nil { + http.Error(resp, err.Error(), http.StatusInternalServerError) + } else { + resp.Write([]byte{'\n'}) + } +} // PoolStatus struct type PoolStatus struct { @@ -258,22 +288,43 @@ type PoolStatus struct { Len int `json:"BuffersInUse"` } +type volumeStatusEnt struct { + Label string + Status *VolumeStatus `json:",omitempty"` + VolumeStats *ioStats `json:",omitempty"` + InternalStats interface{} `json:",omitempty"` +} + // NodeStatus struct type NodeStatus struct { - Volumes []*VolumeStatus `json:"volumes"` - BufferPool PoolStatus - PullQueue WorkQueueStatus - TrashQueue WorkQueueStatus - Memory runtime.MemStats + Volumes []*volumeStatusEnt + BufferPool PoolStatus + PullQueue WorkQueueStatus + TrashQueue WorkQueueStatus + RequestsCurrent int + RequestsMax int } var st NodeStatus var stLock sync.Mutex +// DebugHandler addresses /debug.json requests. +func (rtr *router) DebugHandler(resp http.ResponseWriter, req *http.Request) { + type debugStats struct { + MemStats runtime.MemStats + } + var ds debugStats + runtime.ReadMemStats(&ds.MemStats) + err := json.NewEncoder(resp).Encode(&ds) + if err != nil { + http.Error(resp, err.Error(), 500) + } +} + // StatusHandler addresses /status.json requests. -func StatusHandler(resp http.ResponseWriter, req *http.Request) { +func (rtr *router) StatusHandler(resp http.ResponseWriter, req *http.Request) { stLock.Lock() - readNodeStatus(&st) + rtr.readNodeStatus(&st) jstat, err := json.Marshal(&st) stLock.Unlock() if err == nil { @@ -286,23 +337,33 @@ func StatusHandler(resp http.ResponseWriter, req *http.Request) { } // populate the given NodeStatus struct with current values. -func readNodeStatus(st *NodeStatus) { +func (rtr *router) readNodeStatus(st *NodeStatus) { vols := KeepVM.AllReadable() if cap(st.Volumes) < len(vols) { - st.Volumes = make([]*VolumeStatus, len(vols)) + st.Volumes = make([]*volumeStatusEnt, len(vols)) } st.Volumes = st.Volumes[:0] for _, vol := range vols { - if s := vol.Status(); s != nil { - st.Volumes = append(st.Volumes, s) + var internalStats interface{} + if vol, ok := vol.(InternalStatser); ok { + internalStats = vol.InternalStats() } + st.Volumes = append(st.Volumes, &volumeStatusEnt{ + Label: vol.String(), + Status: vol.Status(), + InternalStats: internalStats, + //VolumeStats: KeepVM.VolumeStats(vol), + }) } st.BufferPool.Alloc = bufs.Alloc() st.BufferPool.Cap = bufs.Cap() st.BufferPool.Len = bufs.Len() st.PullQueue = getWorkQueueStatus(pullq) st.TrashQueue = getWorkQueueStatus(trashq) - runtime.ReadMemStats(&st.Memory) + if rtr.limiter != nil { + st.RequestsCurrent = rtr.limiter.Current() + st.RequestsMax = rtr.limiter.Max() + } } // return a WorkQueueStatus for the given queue. If q is nil (which @@ -433,6 +494,9 @@ func DeleteHandler(resp http.ResponseWriter, req *http.Request) { type PullRequest struct { Locator string `json:"locator"` Servers []string `json:"servers"` + + // Destination mount, or "" for "anywhere" + MountUUID string } // PullHandler processes "PUT /pull" requests for the data manager. @@ -469,6 +533,9 @@ func PullHandler(resp http.ResponseWriter, req *http.Request) { type TrashRequest struct { Locator string `json:"locator"` BlockMtime int64 `json:"block_mtime"` + + // Target mount, or "" for "everywhere" + MountUUID string } // TrashHandler processes /trash requests.