// The PullHandler and TrashHandler process "PUT /pull" and "PUT
// /trash" requests from Data Manager. These requests instruct
// Keep to replicate or delete blocks; see
- // https://arvados.org/projects/orvos-private/wiki/Keep_Design_Doc
+ // https://arvados.org/projects/arvados/wiki/Keep_Design_Doc
// for more details.
//
// Each handler parses the JSON list of block management requests
- // in the message body, and delivers them to the pull queue or
- // trash queue, respectively.
+ // in the message body, and replaces any existing pull queue or
+ // trash queue with their contentes.
+ //
rest.HandleFunc(`/pull`, PullHandler).Methods("PUT")
rest.HandleFunc(`/trash`, TrashHandler).Methods("PUT")
func GetBlockHandler(resp http.ResponseWriter, req *http.Request) {
hash := mux.Vars(req)["hash"]
- log.Printf("%s %s", req.Method, hash)
-
hints := mux.Vars(req)["hints"]
// Parse the locator string and hints from the request.
// presumed to be valid and ignored, to permit forward compatibility.
} else {
// Unknown format; not a valid locator.
+ log.Printf("%s %s %d %s", req.Method, hash, BadRequestError.HTTPCode, "-")
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
return
}
// request's permission signature.
if enforce_permissions {
if signature == "" || timestamp == "" {
+ log.Printf("%s %s %d %s", req.Method, hash, PermissionError.HTTPCode, "-")
http.Error(resp, PermissionError.Error(), PermissionError.HTTPCode)
return
} else if IsExpired(timestamp) {
+ log.Printf("%s %s %d %s", req.Method, hash, ExpiredError.HTTPCode, "-")
http.Error(resp, ExpiredError.Error(), ExpiredError.HTTPCode)
return
} else {
req_locator := req.URL.Path[1:] // strip leading slash
if !VerifySignature(req_locator, GetApiToken(req)) {
+ log.Printf("%s %s %d %s", req.Method, hash, PermissionError.HTTPCode, "-")
http.Error(resp, PermissionError.Error(), PermissionError.HTTPCode)
return
}
if err == NotFoundError {
log.Printf("%s: not found, giving up\n", hash)
}
+ log.Printf("%s %s %d %s", req.Method, hash, err.(*KeepError).HTTPCode, "-")
http.Error(resp, err.Error(), err.(*KeepError).HTTPCode)
return
}
_, err = resp.Write(block)
if err != nil {
- log.Printf("GetBlockHandler: writing response: %s", err)
+ log.Printf("%s %s %d %s", req.Method, hash, err.(*KeepError).HTTPCode, len(block), "-")
+ } else {
+ log.Printf("%s %s %d %d", req.Method, hash, 200, len(block))
}
return
hash := mux.Vars(req)["hash"]
- log.Printf("%s %s", req.Method, hash)
-
// Read the block data to be stored.
// If the request exceeds BLOCKSIZE bytes, issue a HTTP 500 error.
//
if req.ContentLength > BLOCKSIZE {
+ log.Printf("%s %s %d %d", req.Method, hash, TooLongError.HTTPCode, req.ContentLength)
http.Error(resp, TooLongError.Error(), TooLongError.HTTPCode)
return
}
buf := make([]byte, req.ContentLength)
nread, err := io.ReadFull(req.Body, buf)
if err != nil {
+ log.Printf("%s %s %d %d", req.Method, hash, 500, req.ContentLength)
http.Error(resp, err.Error(), 500)
} else if int64(nread) < req.ContentLength {
+ log.Printf("%s %s %d %d", req.Method, hash, 500, req.ContentLength)
http.Error(resp, "request truncated", 500)
} else {
if err := PutBlock(buf, hash); err == nil {
expiry := time.Now().Add(permission_ttl)
return_hash = SignLocator(return_hash, api_token, expiry)
}
+ log.Printf("%s %s %d %d", req.Method, hash, 200, req.ContentLength)
resp.Write([]byte(return_hash + "\n"))
} else {
ke := err.(*KeepError)
+ log.Printf("%s %s %d %d", req.Method, hash, ke.HTTPCode, req.ContentLength)
http.Error(resp, ke.Error(), ke.HTTPCode)
}
}
func PullHandler(resp http.ResponseWriter, req *http.Request) {
// Reject unauthorized requests.
- api_token := GetApiToken(req)
- if !IsDataManagerToken(api_token) {
+ if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
return
func TrashHandler(resp http.ResponseWriter, req *http.Request) {
// Reject unauthorized requests.
- api_token := GetApiToken(req)
- if !IsDataManagerToken(api_token) {
+ if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
return