change filer API to gRPC

2018-05-08 01:59:43 -07:00
parent 4936d6c342
commit 43a69d20bf
11 changed files with 951 additions and 255 deletions
--- a/weed/server/filer_grpc_server.go
+++ b/weed/server/filer_grpc_server.go
@@ -0,0 +1,108 @@
+package weed_server
+
+import (
+	"context"
+	"github.com/chrislusf/seaweedfs/weed/filer"
+	"bazil.org/fuse"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/util"
+	"strconv"
+)
+
+func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer.LookupDirectoryEntryRequest) (*filer.LookupDirectoryEntryResponse, error) {
+
+	found, fileId, err := fs.filer.LookupDirectoryEntry(req.Directory, req.Name)
+	if err != nil {
+		return nil, err
+	}
+	if !found {
+		return nil, fuse.ENOENT
+	}
+
+	return &filer.LookupDirectoryEntryResponse{
+		Entry: &filer.Entry{
+			Name:        req.Name,
+			IsDirectory: fileId == "",
+			FileId:      fileId,
+		},
+	}, nil
+}
+
+func (fs *FilerServer) ListEntries(ctx context.Context, req *filer.ListEntriesRequest) (*filer.ListEntriesResponse, error) {
+
+	directoryNames, err := fs.filer.ListDirectories(req.Directory)
+	if err != nil {
+		return nil, err
+	}
+	files, err := fs.filer.ListFiles(req.Directory, "", 1000)
+	if err != nil {
+		return nil, err
+	}
+
+	resp := &filer.ListEntriesResponse{}
+	for _, dir := range directoryNames {
+		resp.Entries = append(resp.Entries, &filer.Entry{
+			Name:        string(dir),
+			IsDirectory: true,
+		})
+	}
+	for _, fileEntry := range files {
+		resp.Entries = append(resp.Entries, &filer.Entry{
+			Name:        fileEntry.Name,
+			IsDirectory: false,
+			FileId:      string(fileEntry.Id),
+		})
+	}
+
+	return resp, nil
+}
+
+func (fs *FilerServer) GetFileAttributes(ctx context.Context, req *filer.GetFileAttributesRequest) (*filer.GetFileAttributesResponse, error) {
+
+	attributes := &filer.FuseAttributes{}
+
+	server, err := operation.LookupFileId(fs.getMasterNode(), req.FileId)
+	if err != nil {
+		return nil, err
+	}
+	head, err := util.Head(server)
+	if err != nil {
+		return nil, err
+	}
+	attributes.FileSize, err = strconv.ParseUint(head.Get("Content-Length"), 10, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	return &filer.GetFileAttributesResponse{
+		Attributes: attributes,
+	}, nil
+}
+
+func (fs *FilerServer) GetFileContent(ctx context.Context, req *filer.GetFileContentRequest) (*filer.GetFileContentResponse, error) {
+
+	server, err := operation.LookupFileId(fs.getMasterNode(), req.FileId)
+	if err != nil {
+		return nil, err
+	}
+	content, err := util.Get(server)
+	if err != nil {
+		return nil, err
+	}
+
+	return &filer.GetFileContentResponse{
+		Content: content,
+	}, nil
+}
+
+func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer.DeleteEntryRequest) (resp *filer.DeleteEntryResponse, err error) {
+	if req.IsDirectory {
+		err = fs.filer.DeleteDirectory(req.Directory+req.Name, false)
+	} else {
+		fid, err := fs.filer.DeleteFile(req.Directory + req.Name)
+		if err == nil && fid != "" {
+			err = operation.DeleteFile(fs.getMasterNode(), fid, fs.jwt(fid))
+		}
+	}
+	return nil, err
+}
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -106,7 +106,6 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, ip string, port int,
 		}

 		defaultMux.HandleFunc("/admin/mv", fs.moveHandler)
-		defaultMux.HandleFunc("/__api__", fs.apiHandler)
 	}

 	defaultMux.HandleFunc("/admin/register", fs.registerHandler)
--- a/weed/server/filer_server_handlers_api.go
+++ b/weed/server/filer_server_handlers_api.go
@@ -1,83 +0,0 @@
-package weed_server
-
-import (
-	"encoding/json"
-	"net/http"
-	"strconv"
-
-	"github.com/chrislusf/seaweedfs/weed/filer"
-	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/weed/util"
-)
-
-func (fs *FilerServer) apiHandler(w http.ResponseWriter, r *http.Request) {
-	request := r.FormValue("request")
-	apiRequest := filer.ApiRequest{}
-
-	err := json.Unmarshal([]byte(request), &apiRequest)
-	if err != nil {
-		glog.V(0).Infoln("failing to read request", r.RequestURI, request)
-		writeJsonError(w, r, http.StatusInternalServerError, err)
-	}
-
-	glog.V(2).Infof("api request: %+v", apiRequest)
-
-	switch apiRequest.Command {
-	case "lookupDirectoryEntry":
-		res := filer.LookupDirectoryEntryResult{}
-		res.Found, res.FileId, err = fs.filer.LookupDirectoryEntry(apiRequest.Directory, apiRequest.FileName)
-		if err != nil {
-			res.Error = err.Error()
-		}
-		writeJsonQuiet(w, r, http.StatusOK, res)
-	case "listDirectories":
-		res := filer.ListDirectoriesResult{}
-		res.Directories, err = fs.filer.ListDirectories(apiRequest.Directory)
-		if err != nil {
-			res.Error = err.Error()
-		}
-		writeJsonQuiet(w, r, http.StatusOK, res)
-	case "listFiles":
-		res := filer.ListFilesResult{}
-		res.Files, err = fs.filer.ListFiles(apiRequest.Directory, apiRequest.FileName, 1000)
-		if err != nil {
-			res.Error = err.Error()
-		}
-		writeJsonQuiet(w, r, http.StatusOK, res)
-	case "getFileSize":
-		res := filer.GetFileSizeResult{}
-		server, err := operation.LookupFileId(fs.getMasterNode(), apiRequest.FileId)
-		if err != nil {
-			res.Error = err.Error()
-			writeJsonQuiet(w, r, http.StatusOK, res)
-			return
-		}
-		head, err := util.Head(server)
-		if err != nil {
-			res.Error = err.Error()
-			writeJsonQuiet(w, r, http.StatusOK, res)
-			return
-		}
-		res.Size, err = strconv.ParseUint(head.Get("Content-Length"), 10, 0)
-		if err != nil {
-			res.Error = err.Error()
-		}
-		writeJsonQuiet(w, r, http.StatusOK, res)
-	case "getFileContent":
-		res := filer.GetFileContentResult{}
-		server, err := operation.LookupFileId(fs.getMasterNode(), apiRequest.FileId)
-		if err != nil {
-			res.Error = err.Error()
-			writeJsonQuiet(w, r, http.StatusOK, res)
-			return
-		}
-		res.Content, err = util.Get(server)
-		if err != nil {
-			res.Error = err.Error()
-			writeJsonQuiet(w, r, http.StatusOK, res)
-			return
-		}
-		writeJsonQuiet(w, r, http.StatusOK, res)
-	}
-}