X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/46b3cec92aeb88a1b12f45b5484a1de0c7d137e6..cbd11b4bfd5bcc637abe0e7678239dd1e7a2fbd2:/services/keepstore/handlers.go

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 84fa6a6a88..038e812c4f 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -10,10 +10,10 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"container/list"
 	"crypto/md5"
 	"encoding/json"
 	"fmt"
-	"git.curoverse.com/arvados.git/services/keepstore/pull_list"
 	"github.com/gorilla/mux"
 	"io"
 	"log"
@@ -59,10 +59,12 @@ func MakeRESTRouter() *mux.Router {
 		`/index/{prefix:[0-9a-f]{0,32}}`, IndexHandler).Methods("GET", "HEAD")
 	rest.HandleFunc(`/status.json`, StatusHandler).Methods("GET", "HEAD")
 
-	// The PullHandler processes "PUT /pull" commands from Data Manager.
-	// It parses the JSON list of pull requests in the request body, and
-	// delivers them to the pull list manager for replication.
+	// The PullHandler and TrashHandler process "PUT /pull" and "PUT
+	// /trash" requests from Data Manager.  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.
 	rest.HandleFunc(`/pull`, PullHandler).Methods("PUT")
+	rest.HandleFunc(`/trash`, TrashHandler).Methods("PUT")
 
 	// Any request which does not match any of these routes gets
 	// 400 Bad Request.
@@ -436,6 +438,11 @@ func DeleteHandler(resp http.ResponseWriter, req *http.Request) {
    If the JSON unmarshalling fails, return 400 Bad Request.
 */
 
+type PullRequest struct {
+	Locator string   `json:"locator"`
+	Servers []string `json:"servers"`
+}
+
 func PullHandler(resp http.ResponseWriter, req *http.Request) {
 	// Reject unauthorized requests.
 	api_token := GetApiToken(req)
@@ -446,9 +453,9 @@ func PullHandler(resp http.ResponseWriter, req *http.Request) {
 	}
 
 	// Parse the request body.
-	var plist []pull_list.PullRequest
+	var pr []PullRequest
 	r := json.NewDecoder(req.Body)
-	if err := r.Decode(&plist); err != nil {
+	if err := r.Decode(&pr); err != nil {
 		http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
 		log.Printf("%s %s: %s\n", req.Method, req.URL, err.Error())
 		return
@@ -457,15 +464,62 @@ func PullHandler(resp http.ResponseWriter, req *http.Request) {
 	// We have a properly formatted pull list sent from the data
 	// manager.  Report success and send the list to the pull list
 	// manager for further handling.
-	log.Printf("%s %s: received %v\n", req.Method, req.URL, plist)
+	log.Printf("%s %s: received %v\n", req.Method, req.URL, pr)
 	resp.WriteHeader(http.StatusOK)
 	resp.Write([]byte(
-		fmt.Sprintf("Received %d pull requests\n", len(plist))))
+		fmt.Sprintf("Received %d pull requests\n", len(pr))))
+
+	plist := list.New()
+	for _, p := range pr {
+		plist.PushBack(p)
+	}
+
+	if pullq == nil {
+		pullq = NewWorkQueue()
+	}
+	pullq.ReplaceQueue(plist)
+}
+
+type TrashRequest struct {
+	Locator    string `json:"locator"`
+	BlockMtime int64  `json:"block_mtime"`
+}
+
+func TrashHandler(resp http.ResponseWriter, req *http.Request) {
+	// Reject unauthorized requests.
+	api_token := GetApiToken(req)
+	if !IsDataManagerToken(api_token) {
+		http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
+		log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
+		return
+	}
+
+	// Parse the request body.
+	var trash []TrashRequest
+	r := json.NewDecoder(req.Body)
+	if err := r.Decode(&trash); err != nil {
+		http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
+		log.Printf("%s %s: %s\n", req.Method, req.URL, err.Error())
+		return
+	}
+
+	// We have a properly formatted trash list sent from the data
+	// manager.  Report success and send the list to the trash work
+	// queue for further handling.
+	log.Printf("%s %s: received %v\n", req.Method, req.URL, trash)
+	resp.WriteHeader(http.StatusOK)
+	resp.Write([]byte(
+		fmt.Sprintf("Received %d trash requests\n", len(trash))))
+
+	tlist := list.New()
+	for _, t := range trash {
+		tlist.PushBack(t)
+	}
 
-	if pullmgr == nil {
-		pullmgr = pull_list.NewManager()
+	if trashq == nil {
+		trashq = NewWorkQueue()
 	}
-	pullmgr.SetList(plist)
+	trashq.ReplaceQueue(tlist)
 }
 
 // ==============================