From 9f345da20fc7a0d3766df62d1e6f49062373588d Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 9 May 2018 23:18:02 -0700 Subject: [PATCH] mv filer proto to filer_pb --- weed/command/filer.go | 4 +- weed/filesys/dir.go | 17 ++-- weed/filesys/file.go | 9 +- weed/filesys/wfs.go | 6 +- weed/pb/Makefile | 2 +- weed/pb/filer.proto | 2 +- weed/{filer => pb/filer_pb}/filer.pb.go | 117 ++++++++++++------------ weed/server/filer_grpc_server.go | 31 ++++--- 8 files changed, 96 insertions(+), 92 deletions(-) rename weed/{filer => pb/filer_pb}/filer.pb.go (77%) diff --git a/weed/command/filer.go b/weed/command/filer.go index 316fb115b..a2929d0d3 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -11,8 +11,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/util" "github.com/soheilhy/cmux" "google.golang.org/grpc/reflection" - "github.com/chrislusf/seaweedfs/weed/filer" "google.golang.org/grpc" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) var ( @@ -145,7 +145,7 @@ func (fo *FilerOptions) start() { // Create your protocol servers. grpcS := grpc.NewServer() - filer.RegisterSeaweedFilerServer(grpcS, fs) + filer_pb.RegisterSeaweedFilerServer(grpcS, fs) reflection.Register(grpcS) httpS := &http.Server{Handler: defaultMux} diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index fa4b81eba..c1c6afe9c 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -5,12 +5,13 @@ import ( "fmt" "os" "path" + "sync" "bazil.org/fuse/fs" "bazil.org/fuse" "github.com/chrislusf/seaweedfs/weed/filer" - "sync" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) type Dir struct { @@ -50,10 +51,10 @@ func (dir *Dir) Lookup(ctx context.Context, name string) (node fs.Node, err erro return node, nil } - var entry *filer.Entry - err = dir.wfs.withFilerClient(func(client filer.SeaweedFilerClient) error { + var entry *filer_pb.Entry + err = dir.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { - request := &filer.LookupDirectoryEntryRequest{ + request := &filer_pb.LookupDirectoryEntryRequest{ Directory: dir.Path, Name: name, } @@ -84,9 +85,9 @@ func (dir *Dir) Lookup(ctx context.Context, name string) (node fs.Node, err erro func (dir *Dir) ReadDirAll(ctx context.Context) (ret []fuse.Dirent, err error) { - err = dir.wfs.withFilerClient(func(client filer.SeaweedFilerClient) error { + err = dir.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { - request := &filer.ListEntriesRequest{ + request := &filer_pb.ListEntriesRequest{ Directory: dir.Path, } @@ -117,9 +118,9 @@ func (dir *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { dir.NodeMapLock.Lock() defer dir.NodeMapLock.Unlock() - return dir.wfs.withFilerClient(func(client filer.SeaweedFilerClient) error { + return dir.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { - request := &filer.DeleteEntryRequest{ + request := &filer_pb.DeleteEntryRequest{ Directory: dir.Path, Name: req.Name, IsDirectory: req.Dir, diff --git a/weed/filesys/file.go b/weed/filesys/file.go index e743509e9..e4c79c055 100644 --- a/weed/filesys/file.go +++ b/weed/filesys/file.go @@ -8,6 +8,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/filer" "bazil.org/fuse/fs" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) var _ = fs.Node(&File{}) @@ -26,9 +27,9 @@ type File struct { func (file *File) Attr(context context.Context, attr *fuse.Attr) error { attr.Mode = 0444 - return file.wfs.withFilerClient(func(client filer.SeaweedFilerClient) error { + return file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { - request := &filer.GetFileAttributesRequest{ + request := &filer_pb.GetFileAttributesRequest{ Name: file.Name, ParentDir: "", //TODO add parent folder FileId: string(file.FileId), @@ -48,9 +49,9 @@ func (file *File) Attr(context context.Context, attr *fuse.Attr) error { func (file *File) ReadAll(ctx context.Context) (content []byte, err error) { - err = file.wfs.withFilerClient(func(client filer.SeaweedFilerClient) error { + err = file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { - request := &filer.GetFileContentRequest{ + request := &filer_pb.GetFileContentRequest{ FileId: string(file.FileId), } diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 583cd34f3..da50ae4a4 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -4,7 +4,7 @@ import ( "bazil.org/fuse/fs" "fmt" "google.golang.org/grpc" - "github.com/chrislusf/seaweedfs/weed/filer" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) type WFS struct { @@ -21,7 +21,7 @@ func (wfs *WFS) Root() (fs.Node, error) { return &Dir{Path: "/", wfs: wfs}, nil } -func (wfs *WFS) withFilerClient(fn func(filer.SeaweedFilerClient) error) error { +func (wfs *WFS) withFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error { grpcConnection, err := grpc.Dial(wfs.filer, grpc.WithInsecure()) if err != nil { @@ -29,7 +29,7 @@ func (wfs *WFS) withFilerClient(fn func(filer.SeaweedFilerClient) error) error { } defer grpcConnection.Close() - client := filer.NewSeaweedFilerClient(grpcConnection) + client := filer_pb.NewSeaweedFilerClient(grpcConnection) return fn(client) } diff --git a/weed/pb/Makefile b/weed/pb/Makefile index edcab5e51..973320b34 100644 --- a/weed/pb/Makefile +++ b/weed/pb/Makefile @@ -4,4 +4,4 @@ all: gen gen: protoc seaweed.proto --go_out=plugins=grpc:./master_pb - protoc filer.proto --go_out=plugins=grpc:../filer + protoc filer.proto --go_out=plugins=grpc:./filer_pb diff --git a/weed/pb/filer.proto b/weed/pb/filer.proto index a7a7f42f0..822bf143e 100644 --- a/weed/pb/filer.proto +++ b/weed/pb/filer.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package filer; +package filer_pb; ////////////////////////////////////////////////// diff --git a/weed/filer/filer.pb.go b/weed/pb/filer_pb/filer.pb.go similarity index 77% rename from weed/filer/filer.pb.go rename to weed/pb/filer_pb/filer.pb.go index d93f38e27..98d2c32b6 100644 --- a/weed/filer/filer.pb.go +++ b/weed/pb/filer_pb/filer.pb.go @@ -3,7 +3,7 @@ // DO NOT EDIT! /* -Package filer is a generated protocol buffer package. +Package filer_pb is a generated protocol buffer package. It is generated from these files: filer.proto @@ -22,7 +22,7 @@ It has these top-level messages: DeleteEntryRequest DeleteEntryResponse */ -package filer +package filer_pb import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -325,18 +325,18 @@ func (*DeleteEntryResponse) ProtoMessage() {} func (*DeleteEntryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func init() { - proto.RegisterType((*LookupDirectoryEntryRequest)(nil), "filer.LookupDirectoryEntryRequest") - proto.RegisterType((*LookupDirectoryEntryResponse)(nil), "filer.LookupDirectoryEntryResponse") - proto.RegisterType((*ListEntriesRequest)(nil), "filer.ListEntriesRequest") - proto.RegisterType((*ListEntriesResponse)(nil), "filer.ListEntriesResponse") - proto.RegisterType((*Entry)(nil), "filer.Entry") - proto.RegisterType((*FuseAttributes)(nil), "filer.FuseAttributes") - proto.RegisterType((*GetFileAttributesRequest)(nil), "filer.GetFileAttributesRequest") - proto.RegisterType((*GetFileAttributesResponse)(nil), "filer.GetFileAttributesResponse") - proto.RegisterType((*GetFileContentRequest)(nil), "filer.GetFileContentRequest") - proto.RegisterType((*GetFileContentResponse)(nil), "filer.GetFileContentResponse") - proto.RegisterType((*DeleteEntryRequest)(nil), "filer.DeleteEntryRequest") - proto.RegisterType((*DeleteEntryResponse)(nil), "filer.DeleteEntryResponse") + proto.RegisterType((*LookupDirectoryEntryRequest)(nil), "filer_pb.LookupDirectoryEntryRequest") + proto.RegisterType((*LookupDirectoryEntryResponse)(nil), "filer_pb.LookupDirectoryEntryResponse") + proto.RegisterType((*ListEntriesRequest)(nil), "filer_pb.ListEntriesRequest") + proto.RegisterType((*ListEntriesResponse)(nil), "filer_pb.ListEntriesResponse") + proto.RegisterType((*Entry)(nil), "filer_pb.Entry") + proto.RegisterType((*FuseAttributes)(nil), "filer_pb.FuseAttributes") + proto.RegisterType((*GetFileAttributesRequest)(nil), "filer_pb.GetFileAttributesRequest") + proto.RegisterType((*GetFileAttributesResponse)(nil), "filer_pb.GetFileAttributesResponse") + proto.RegisterType((*GetFileContentRequest)(nil), "filer_pb.GetFileContentRequest") + proto.RegisterType((*GetFileContentResponse)(nil), "filer_pb.GetFileContentResponse") + proto.RegisterType((*DeleteEntryRequest)(nil), "filer_pb.DeleteEntryRequest") + proto.RegisterType((*DeleteEntryResponse)(nil), "filer_pb.DeleteEntryResponse") } // Reference imports to suppress errors if they are not otherwise used. @@ -367,7 +367,7 @@ func NewSeaweedFilerClient(cc *grpc.ClientConn) SeaweedFilerClient { func (c *seaweedFilerClient) LookupDirectoryEntry(ctx context.Context, in *LookupDirectoryEntryRequest, opts ...grpc.CallOption) (*LookupDirectoryEntryResponse, error) { out := new(LookupDirectoryEntryResponse) - err := grpc.Invoke(ctx, "/filer.SeaweedFiler/LookupDirectoryEntry", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/filer_pb.SeaweedFiler/LookupDirectoryEntry", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -376,7 +376,7 @@ func (c *seaweedFilerClient) LookupDirectoryEntry(ctx context.Context, in *Looku func (c *seaweedFilerClient) ListEntries(ctx context.Context, in *ListEntriesRequest, opts ...grpc.CallOption) (*ListEntriesResponse, error) { out := new(ListEntriesResponse) - err := grpc.Invoke(ctx, "/filer.SeaweedFiler/ListEntries", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/filer_pb.SeaweedFiler/ListEntries", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -385,7 +385,7 @@ func (c *seaweedFilerClient) ListEntries(ctx context.Context, in *ListEntriesReq func (c *seaweedFilerClient) GetFileAttributes(ctx context.Context, in *GetFileAttributesRequest, opts ...grpc.CallOption) (*GetFileAttributesResponse, error) { out := new(GetFileAttributesResponse) - err := grpc.Invoke(ctx, "/filer.SeaweedFiler/GetFileAttributes", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/filer_pb.SeaweedFiler/GetFileAttributes", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -394,7 +394,7 @@ func (c *seaweedFilerClient) GetFileAttributes(ctx context.Context, in *GetFileA func (c *seaweedFilerClient) GetFileContent(ctx context.Context, in *GetFileContentRequest, opts ...grpc.CallOption) (*GetFileContentResponse, error) { out := new(GetFileContentResponse) - err := grpc.Invoke(ctx, "/filer.SeaweedFiler/GetFileContent", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/filer_pb.SeaweedFiler/GetFileContent", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -403,7 +403,7 @@ func (c *seaweedFilerClient) GetFileContent(ctx context.Context, in *GetFileCont func (c *seaweedFilerClient) DeleteEntry(ctx context.Context, in *DeleteEntryRequest, opts ...grpc.CallOption) (*DeleteEntryResponse, error) { out := new(DeleteEntryResponse) - err := grpc.Invoke(ctx, "/filer.SeaweedFiler/DeleteEntry", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/filer_pb.SeaweedFiler/DeleteEntry", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -434,7 +434,7 @@ func _SeaweedFiler_LookupDirectoryEntry_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/filer.SeaweedFiler/LookupDirectoryEntry", + FullMethod: "/filer_pb.SeaweedFiler/LookupDirectoryEntry", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SeaweedFilerServer).LookupDirectoryEntry(ctx, req.(*LookupDirectoryEntryRequest)) @@ -452,7 +452,7 @@ func _SeaweedFiler_ListEntries_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/filer.SeaweedFiler/ListEntries", + FullMethod: "/filer_pb.SeaweedFiler/ListEntries", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SeaweedFilerServer).ListEntries(ctx, req.(*ListEntriesRequest)) @@ -470,7 +470,7 @@ func _SeaweedFiler_GetFileAttributes_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/filer.SeaweedFiler/GetFileAttributes", + FullMethod: "/filer_pb.SeaweedFiler/GetFileAttributes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SeaweedFilerServer).GetFileAttributes(ctx, req.(*GetFileAttributesRequest)) @@ -488,7 +488,7 @@ func _SeaweedFiler_GetFileContent_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/filer.SeaweedFiler/GetFileContent", + FullMethod: "/filer_pb.SeaweedFiler/GetFileContent", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SeaweedFilerServer).GetFileContent(ctx, req.(*GetFileContentRequest)) @@ -506,7 +506,7 @@ func _SeaweedFiler_DeleteEntry_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/filer.SeaweedFiler/DeleteEntry", + FullMethod: "/filer_pb.SeaweedFiler/DeleteEntry", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SeaweedFilerServer).DeleteEntry(ctx, req.(*DeleteEntryRequest)) @@ -515,7 +515,7 @@ func _SeaweedFiler_DeleteEntry_Handler(srv interface{}, ctx context.Context, dec } var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{ - ServiceName: "filer.SeaweedFiler", + ServiceName: "filer_pb.SeaweedFiler", HandlerType: (*SeaweedFilerServer)(nil), Methods: []grpc.MethodDesc{ { @@ -546,38 +546,39 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("filer.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 523 bytes of a gzipped FileDescriptorProto + // 532 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xad, 0x71, 0xdc, 0x34, 0x93, 0xb4, 0x82, 0x69, 0x03, 0xae, 0x9b, 0x8a, 0xb0, 0x48, 0x88, - 0x53, 0x85, 0x82, 0x38, 0x72, 0x00, 0x42, 0x10, 0x52, 0x51, 0x25, 0xf7, 0xc2, 0xad, 0x72, 0xeb, - 0x69, 0xb5, 0x22, 0xb1, 0x83, 0x77, 0x2d, 0xd4, 0x9e, 0x39, 0xf3, 0x4b, 0xf8, 0x91, 0x68, 0x3f, - 0xec, 0xd8, 0xd8, 0xa9, 0x22, 0xf5, 0xe6, 0x7d, 0x33, 0x6f, 0xe6, 0xcd, 0x97, 0xa1, 0x7f, 0xcd, - 0xe7, 0x94, 0x9d, 0x2c, 0xb3, 0x54, 0xa6, 0xe8, 0xe9, 0x07, 0x3b, 0x83, 0xa3, 0xd3, 0x34, 0xfd, - 0x91, 0x2f, 0xa7, 0x3c, 0xa3, 0x2b, 0x99, 0x66, 0xb7, 0x9f, 0x13, 0x99, 0xdd, 0x86, 0xf4, 0x33, - 0x27, 0x21, 0x71, 0x04, 0xbd, 0xb8, 0x30, 0xf8, 0xce, 0xd8, 0x79, 0xdd, 0x0b, 0x57, 0x00, 0x22, - 0x74, 0x92, 0x68, 0x41, 0xfe, 0x23, 0x6d, 0xd0, 0xdf, 0xec, 0x23, 0x8c, 0xda, 0x03, 0x8a, 0x65, - 0x9a, 0x08, 0x42, 0x06, 0x1e, 0x29, 0x40, 0x47, 0xeb, 0x4f, 0x06, 0x27, 0x46, 0x94, 0x71, 0x32, - 0x26, 0x36, 0x01, 0x3c, 0xe5, 0x42, 0x2a, 0x8c, 0x93, 0xd8, 0x48, 0x0b, 0x7b, 0x0f, 0xfb, 0x35, - 0x8e, 0x4d, 0xf7, 0x0a, 0xba, 0x64, 0x20, 0xdf, 0x19, 0xbb, 0x8d, 0x84, 0x85, 0x91, 0xfd, 0x71, - 0xc0, 0xd3, 0x50, 0x59, 0x94, 0xb3, 0x2a, 0x0a, 0x5f, 0xc0, 0x80, 0x8b, 0x8b, 0x55, 0x76, 0x55, - 0xf0, 0x4e, 0xd8, 0xe7, 0xa2, 0x2c, 0x12, 0x9f, 0x41, 0x57, 0x05, 0xbe, 0xe0, 0xb1, 0xef, 0x6a, - 0xe6, 0xb6, 0x7a, 0x7e, 0x8d, 0xf1, 0x1d, 0x40, 0x24, 0x65, 0xc6, 0x2f, 0x73, 0x49, 0xc2, 0xef, - 0xe8, 0xaa, 0x87, 0x56, 0xc4, 0x2c, 0x17, 0xf4, 0xa1, 0x34, 0x86, 0x15, 0x47, 0xf6, 0xdb, 0x81, - 0xbd, 0xba, 0x19, 0x8f, 0xa0, 0xa7, 0x53, 0x08, 0x7e, 0x67, 0xe4, 0x75, 0xc2, 0x1d, 0x05, 0x9c, - 0xf3, 0x3b, 0xc2, 0x03, 0xf0, 0x16, 0x92, 0xdb, 0x61, 0xb8, 0xa1, 0x79, 0x94, 0x94, 0x45, 0x1a, - 0x93, 0xd6, 0xb5, 0x6b, 0x28, 0xdf, 0xd2, 0x98, 0xf0, 0x31, 0xb8, 0x39, 0x8f, 0xb5, 0xa4, 0xdd, - 0x50, 0x7d, 0x2a, 0xe4, 0x86, 0xc7, 0xbe, 0x67, 0x90, 0x1b, 0x1e, 0xb3, 0x6b, 0xf0, 0xbf, 0x90, - 0x9c, 0xf1, 0x79, 0x55, 0xa7, 0x1d, 0x48, 0x5b, 0xa7, 0x8e, 0x01, 0x96, 0x51, 0x46, 0x89, 0x54, - 0xdd, 0xb2, 0x8b, 0xd1, 0x33, 0xc8, 0x94, 0x67, 0x6b, 0xbb, 0xc4, 0x42, 0x38, 0x6c, 0xc9, 0x63, - 0x87, 0x58, 0x6f, 0xa1, 0xb3, 0x69, 0x0b, 0xdf, 0xc0, 0xd0, 0xc6, 0xfc, 0x94, 0x26, 0x92, 0x12, - 0x59, 0x08, 0xaf, 0xa8, 0x70, 0x6a, 0x2a, 0x26, 0xf0, 0xf4, 0x7f, 0x86, 0x95, 0xe0, 0x43, 0xf7, - 0xca, 0x40, 0x9a, 0x32, 0x08, 0x8b, 0x27, 0xe3, 0x80, 0x53, 0x9a, 0x93, 0xa4, 0x87, 0x1d, 0x4e, - 0x63, 0xc7, 0xdc, 0xc6, 0x8e, 0xb1, 0x21, 0xec, 0xd7, 0x52, 0x19, 0x6d, 0x93, 0xbf, 0x2e, 0x0c, - 0xce, 0x29, 0xfa, 0x45, 0x14, 0x2b, 0xe9, 0x19, 0x46, 0x70, 0xd0, 0x76, 0x83, 0xc8, 0x6c, 0xcf, - 0xee, 0xb9, 0xf8, 0xe0, 0xe5, 0xbd, 0x3e, 0x26, 0x23, 0xdb, 0xc2, 0x19, 0xf4, 0x2b, 0xe7, 0x86, - 0x87, 0x05, 0xab, 0x71, 0xb6, 0x41, 0xd0, 0x66, 0x2a, 0xe3, 0x7c, 0x87, 0x27, 0x8d, 0xb9, 0xe3, - 0x73, 0x4b, 0x59, 0xb7, 0x79, 0xc1, 0x78, 0xbd, 0x43, 0x19, 0xf9, 0x0c, 0xf6, 0xea, 0xb3, 0xc4, - 0x51, 0x9d, 0x55, 0x5f, 0x8a, 0xe0, 0x78, 0x8d, 0xb5, 0x5a, 0x72, 0xa5, 0xfb, 0x65, 0xc9, 0xcd, - 0xe1, 0x97, 0x25, 0xb7, 0x0c, 0x8b, 0x6d, 0x5d, 0x6e, 0xeb, 0x1f, 0xf0, 0xdb, 0x7f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x6f, 0xb3, 0x14, 0x9b, 0x8f, 0x05, 0x00, 0x00, + 0x10, 0xad, 0x71, 0xd2, 0x34, 0x93, 0xb4, 0xc0, 0xb4, 0x05, 0x93, 0xa6, 0x22, 0x2c, 0x2a, 0x82, + 0x4b, 0x84, 0xc2, 0x85, 0x23, 0x88, 0xb4, 0x08, 0x29, 0x08, 0xc9, 0x55, 0xaf, 0x44, 0x49, 0x3d, + 0x8d, 0x56, 0x24, 0x76, 0xf0, 0xae, 0x85, 0xda, 0x33, 0x7f, 0x80, 0xbf, 0xc5, 0xaf, 0x42, 0xbb, + 0xeb, 0x8f, 0x35, 0x76, 0x0a, 0x88, 0x9b, 0xf7, 0xcd, 0xbe, 0x99, 0x37, 0x6f, 0x66, 0x0d, 0x9d, + 0x2b, 0xbe, 0xa4, 0x78, 0xb8, 0x8e, 0x23, 0x19, 0xe1, 0x8e, 0x3e, 0x4c, 0xd7, 0x73, 0xf6, 0x09, + 0x8e, 0x26, 0x51, 0xf4, 0x25, 0x59, 0x8f, 0x79, 0x4c, 0x97, 0x32, 0x8a, 0xaf, 0x4f, 0x43, 0x19, + 0x5f, 0xfb, 0xf4, 0x35, 0x21, 0x21, 0xb1, 0x0f, 0xed, 0x20, 0x0b, 0x78, 0xce, 0xc0, 0x79, 0xde, + 0xf6, 0x0b, 0x00, 0x11, 0x1a, 0xe1, 0x6c, 0x45, 0xde, 0x1d, 0x1d, 0xd0, 0xdf, 0xec, 0x14, 0xfa, + 0xf5, 0x09, 0xc5, 0x3a, 0x0a, 0x05, 0xe1, 0x09, 0x34, 0x49, 0x01, 0x3a, 0x5b, 0x67, 0x74, 0x77, + 0x98, 0x49, 0x19, 0x9a, 0x7b, 0x26, 0xca, 0x46, 0x80, 0x13, 0x2e, 0xa4, 0xc2, 0x38, 0x89, 0xbf, + 0x92, 0xc3, 0xde, 0xc0, 0x7e, 0x89, 0x93, 0x56, 0x7c, 0x01, 0x2d, 0x32, 0x90, 0xe7, 0x0c, 0xdc, + 0xba, 0x9a, 0x59, 0x9c, 0xfd, 0x70, 0xa0, 0xa9, 0xa1, 0xbc, 0x35, 0xa7, 0x68, 0x0d, 0x9f, 0x40, + 0x97, 0x8b, 0x69, 0x21, 0x40, 0xb5, 0xbd, 0xe3, 0x77, 0xb8, 0xc8, 0x5b, 0xc5, 0x87, 0xd0, 0x52, + 0xb9, 0xa7, 0x3c, 0xf0, 0x5c, 0xcd, 0xdc, 0x56, 0xc7, 0x0f, 0x01, 0xbe, 0x06, 0x98, 0x49, 0x19, + 0xf3, 0x79, 0x22, 0x49, 0x78, 0x0d, 0xdd, 0xbb, 0x57, 0xe8, 0x38, 0x4b, 0x04, 0xbd, 0xcd, 0xe3, + 0xbe, 0x75, 0x97, 0x7d, 0x77, 0x60, 0xaf, 0x1c, 0xc6, 0x23, 0x68, 0xeb, 0x2a, 0x82, 0xdf, 0x18, + 0x85, 0x0d, 0x5f, 0x4f, 0xf4, 0x9c, 0xdf, 0x10, 0x1e, 0x40, 0x73, 0x25, 0x79, 0x3a, 0x15, 0xd7, + 0x37, 0x87, 0x9c, 0xb2, 0x8a, 0x02, 0xd2, 0xd2, 0x76, 0x0d, 0xe5, 0x63, 0x14, 0x10, 0xde, 0x03, + 0x37, 0xe1, 0x81, 0x56, 0xb5, 0xeb, 0xab, 0x4f, 0x85, 0x2c, 0x78, 0xe0, 0x35, 0x0d, 0xb2, 0xe0, + 0x01, 0xbb, 0x02, 0xef, 0x3d, 0xc9, 0x33, 0xbe, 0xb4, 0x75, 0xa6, 0x63, 0xa9, 0x33, 0xeb, 0x18, + 0x60, 0x3d, 0x8b, 0x29, 0x94, 0xca, 0xb0, 0x74, 0x43, 0xda, 0x06, 0x19, 0xf3, 0x78, 0xa3, 0x51, + 0xec, 0x02, 0x1e, 0xd5, 0xd4, 0x49, 0x47, 0x59, 0x76, 0xd1, 0xf9, 0x07, 0x17, 0x5f, 0xc2, 0x61, + 0x9a, 0xf6, 0x5d, 0x14, 0x4a, 0x0a, 0x65, 0xa6, 0xdd, 0x12, 0xe2, 0x94, 0x84, 0x8c, 0xe0, 0xc1, + 0xef, 0x8c, 0x54, 0x85, 0x07, 0xad, 0x4b, 0x03, 0x69, 0x4a, 0xd7, 0xcf, 0x8e, 0x8c, 0x03, 0x8e, + 0x69, 0x49, 0x92, 0xfe, 0xef, 0x11, 0x55, 0x36, 0xcd, 0xad, 0x6c, 0x1a, 0x3b, 0x84, 0xfd, 0x52, + 0x29, 0xa3, 0x6d, 0xf4, 0xd3, 0x85, 0xee, 0x39, 0xcd, 0xbe, 0x11, 0x05, 0x4a, 0x7a, 0x8c, 0x0b, + 0x38, 0xa8, 0x7b, 0x8f, 0x78, 0x52, 0xd8, 0x76, 0xcb, 0x0f, 0xa0, 0xf7, 0xec, 0x4f, 0xd7, 0x4c, + 0x5d, 0xb6, 0x85, 0x13, 0xe8, 0x58, 0xaf, 0x0f, 0xfb, 0x16, 0xb1, 0xf2, 0x90, 0x7b, 0xc7, 0x1b, + 0xa2, 0x79, 0xb6, 0xcf, 0x70, 0xbf, 0xb2, 0x06, 0xc8, 0x0a, 0xd6, 0xa6, 0x5d, 0xec, 0x3d, 0xbd, + 0xf5, 0x4e, 0x9e, 0xff, 0x02, 0xf6, 0xca, 0xd3, 0xc5, 0xc7, 0x15, 0x62, 0x79, 0x53, 0x7a, 0x83, + 0xcd, 0x17, 0x6c, 0x13, 0xac, 0xa9, 0xd8, 0x26, 0x54, 0xf7, 0xc2, 0x36, 0xa1, 0x66, 0x94, 0x6c, + 0x6b, 0xbe, 0xad, 0xff, 0xd6, 0xaf, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x83, 0x8a, 0x32, + 0xbc, 0x05, 0x00, 0x00, } diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index a0b6ba6db..41b4e9f90 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -2,14 +2,15 @@ package weed_server import ( "context" - "github.com/chrislusf/seaweedfs/weed/filer" + "strconv" + "bazil.org/fuse" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/util" - "strconv" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) -func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer.LookupDirectoryEntryRequest) (*filer.LookupDirectoryEntryResponse, error) { +func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) { found, fileId, err := fs.filer.LookupDirectoryEntry(req.Directory, req.Name) if err != nil { @@ -19,8 +20,8 @@ func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer.Look return nil, fuse.ENOENT } - return &filer.LookupDirectoryEntryResponse{ - Entry: &filer.Entry{ + return &filer_pb.LookupDirectoryEntryResponse{ + Entry: &filer_pb.Entry{ Name: req.Name, IsDirectory: fileId == "", FileId: fileId, @@ -28,7 +29,7 @@ func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer.Look }, nil } -func (fs *FilerServer) ListEntries(ctx context.Context, req *filer.ListEntriesRequest) (*filer.ListEntriesResponse, error) { +func (fs *FilerServer) ListEntries(ctx context.Context, req *filer_pb.ListEntriesRequest) (*filer_pb.ListEntriesResponse, error) { directoryNames, err := fs.filer.ListDirectories(req.Directory) if err != nil { @@ -39,15 +40,15 @@ func (fs *FilerServer) ListEntries(ctx context.Context, req *filer.ListEntriesRe return nil, err } - resp := &filer.ListEntriesResponse{} + resp := &filer_pb.ListEntriesResponse{} for _, dir := range directoryNames { - resp.Entries = append(resp.Entries, &filer.Entry{ + resp.Entries = append(resp.Entries, &filer_pb.Entry{ Name: string(dir), IsDirectory: true, }) } for _, fileEntry := range files { - resp.Entries = append(resp.Entries, &filer.Entry{ + resp.Entries = append(resp.Entries, &filer_pb.Entry{ Name: fileEntry.Name, IsDirectory: false, FileId: string(fileEntry.Id), @@ -57,9 +58,9 @@ func (fs *FilerServer) ListEntries(ctx context.Context, req *filer.ListEntriesRe return resp, nil } -func (fs *FilerServer) GetFileAttributes(ctx context.Context, req *filer.GetFileAttributesRequest) (*filer.GetFileAttributesResponse, error) { +func (fs *FilerServer) GetFileAttributes(ctx context.Context, req *filer_pb.GetFileAttributesRequest) (*filer_pb.GetFileAttributesResponse, error) { - attributes := &filer.FuseAttributes{} + attributes := &filer_pb.FuseAttributes{} server, err := operation.LookupFileId(fs.getMasterNode(), req.FileId) if err != nil { @@ -74,12 +75,12 @@ func (fs *FilerServer) GetFileAttributes(ctx context.Context, req *filer.GetFile return nil, err } - return &filer.GetFileAttributesResponse{ + return &filer_pb.GetFileAttributesResponse{ Attributes: attributes, }, nil } -func (fs *FilerServer) GetFileContent(ctx context.Context, req *filer.GetFileContentRequest) (*filer.GetFileContentResponse, error) { +func (fs *FilerServer) GetFileContent(ctx context.Context, req *filer_pb.GetFileContentRequest) (*filer_pb.GetFileContentResponse, error) { server, err := operation.LookupFileId(fs.getMasterNode(), req.FileId) if err != nil { @@ -90,12 +91,12 @@ func (fs *FilerServer) GetFileContent(ctx context.Context, req *filer.GetFileCon return nil, err } - return &filer.GetFileContentResponse{ + return &filer_pb.GetFileContentResponse{ Content: content, }, nil } -func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer.DeleteEntryRequest) (resp *filer.DeleteEntryResponse, err error) { +func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntryRequest) (resp *filer_pb.DeleteEntryResponse, err error) { if req.IsDirectory { err = fs.filer.DeleteDirectory(req.Directory+req.Name, false) } else {