lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

support renaming files

Browse Source
This commit is contained in:
Chris Lu 2018-06-06 22:11:01 -07:00
parent b3447f4375
commit 5c25d29272
7 changed files with 169 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weed/filer2/filer.go
View File

@ -123,7 +123,7 @@ func (f *Filer) FindEntry(p FullPath) (entry *Entry, err error) {
return f.store.FindEntry(p)
}
func (f *Filer) DeleteEntryMetaAndData(p FullPath) (err error) {
func (f *Filer) DeleteEntryMetaAndData(p FullPath, shouldDeleteChunks bool) (err error) {
entry, err := f.FindEntry(p)
if err != nil {
return err
@ -139,7 +139,9 @@ func (f *Filer) DeleteEntryMetaAndData(p FullPath) (err error) {
}
}
f.deleteChunks(entry)
if shouldDeleteChunks {
f.deleteChunks(entry)
}
return f.store.DeleteEntry(p)
}

2
weed/filer2/memdb/memdb_store_test.go
View File

@ -134,7 +134,7 @@ func TestCreateFileAndList(t *testing.T) {
}
// delete file and count
filer.DeleteEntryMetaAndData(file3Path)
filer.DeleteEntryMetaAndData(file3Path, false)
entries, _ = filer.ListDirectoryEntries(filer2.FullPath("/home/chris/this/is"), "", false, 100)
if len(entries) != 1 {
t.Errorf("list entries count: %v", len(entries))

85
weed/filesys/dir.go
View File

@ -28,6 +28,7 @@ var _ = fs.NodeMkdirer(&Dir{})
var _ = fs.NodeStringLookuper(&Dir{})
var _ = fs.HandleReadDirAller(&Dir{})
var _ = fs.NodeRemover(&Dir{})
var _ = fs.NodeRenamer(&Dir{})
func (dir *Dir) Attr(context context.Context, attr *fuse.Attr) error {
@ -251,9 +252,10 @@ func (dir *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error {
return dir.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
request := &filer_pb.DeleteEntryRequest{
Directory: dir.Path,
Name: req.Name,
IsDirectory: req.Dir,
Directory: dir.Path,
Name: req.Name,
IsDirectory: req.Dir,
IsDeleteData: true,
}
glog.V(1).Infof("remove directory entry: %v", request)
@ -268,3 +270,80 @@ func (dir *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error {
})
}
func (dir *Dir) Rename(ctx context.Context, req *fuse.RenameRequest, newDirectory fs.Node) error {
dir.NodeMapLock.Lock()
defer dir.NodeMapLock.Unlock()
newDir := newDirectory.(*Dir)
var entry *filer_pb.Entry
err := dir.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
// find existing entry
{
request := &filer_pb.LookupDirectoryEntryRequest{
Directory: dir.Path,
Name: req.OldName,
}
glog.V(4).Infof("find existing directory entry: %v", request)
resp, err := client.LookupDirectoryEntry(ctx, request)
if err != nil {
return err
}
entry = resp.Entry
if entry.IsDirectory {
// do not support moving directory
return fuse.ENOTSUP
}
glog.V(4).Infof("found existing directory entry resp: %+v", resp)
}
// add to new directory
{
request := &filer_pb.CreateEntryRequest{
Directory: newDir.Path,
Entry: &filer_pb.Entry{
Name: req.NewName,
IsDirectory: false,
Attributes: entry.Attributes,
Chunks: entry.Chunks,
},
}
glog.V(1).Infof("create new entry: %v", request)
if _, err := client.CreateEntry(ctx, request); err != nil {
return fmt.Errorf("create new entry: %v", err)
}
}
// delete old entry
{
request := &filer_pb.DeleteEntryRequest{
Directory: dir.Path,
Name: req.OldName,
IsDirectory: false,
IsDeleteData: false,
}
glog.V(1).Infof("remove old entry: %v", request)
_, err := client.DeleteEntry(ctx, request)
if err != nil {
return err
}
delete(dir.NodeMap, req.OldName)
}
return nil
})
return err
}

1
weed/pb/filer.proto
View File

@ -113,6 +113,7 @@ message DeleteEntryRequest {
string directory = 1;
string name = 2;
bool is_directory = 3;
bool is_delete_data = 4;
}
message DeleteEntryResponse {

132
weed/pb/filer_pb/filer.pb.go
View File

@ -424,9 +424,10 @@ func (*UpdateEntryResponse) ProtoMessage() {}
func (*UpdateEntryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
type DeleteEntryRequest struct {
Directory string `protobuf:"bytes,1,opt,name=directory" json:"directory,omitempty"`
Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
IsDirectory bool `protobuf:"varint,3,opt,name=is_directory,json=isDirectory" json:"is_directory,omitempty"`
Directory string `protobuf:"bytes,1,opt,name=directory" json:"directory,omitempty"`
Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
IsDirectory bool `protobuf:"varint,3,opt,name=is_directory,json=isDirectory" json:"is_directory,omitempty"`
IsDeleteData bool `protobuf:"varint,4,opt,name=is_delete_data,json=isDeleteData" json:"is_delete_data,omitempty"`
}
func (m *DeleteEntryRequest) Reset() { *m = DeleteEntryRequest{} }
@ -455,6 +456,13 @@ func (m *DeleteEntryRequest) GetIsDirectory() bool {
return false
}
func (m *DeleteEntryRequest) GetIsDeleteData() bool {
if m != nil {
return m.IsDeleteData
}
return false
}
type DeleteEntryResponse struct {
}
@ -939,62 +947,64 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("filer.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 906 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0x5b, 0x6f, 0xdc, 0x44,
0x14, 0x8e, 0xd7, 0xd9, 0x4d, 0x7c, 0x76, 0xc3, 0x65, 0x36, 0x2d, 0x66, 0x9b, 0x54, 0x61, 0xa0,
0xa8, 0x15, 0x52, 0x14, 0x05, 0x1e, 0x2a, 0x10, 0x12, 0x55, 0x53, 0xaa, 0x4a, 0xa9, 0x2a, 0xb9,
0x04, 0x89, 0xa7, 0x95, 0x63, 0x9f, 0x5d, 0x46, 0xf1, 0x0d, 0xcf, 0x38, 0x28, 0xbc, 0xf2, 0x5b,
0x78, 0xe7, 0x81, 0x7f, 0xc0, 0x1f, 0x43, 0x73, 0xb1, 0x3d, 0x8e, 0xbd, 0xbd, 0x3c, 0xf0, 0x36,
0x73, 0x2e, 0xdf, 0xf9, 0xce, 0xcc, 0x99, 0xcf, 0x86, 0xe9, 0x8a, 0x25, 0x58, 0x1e, 0x17, 0x65,
0x2e, 0x72, 0xb2, 0xab, 0x36, 0xcb, 0xe2, 0x92, 0xbe, 0x82, 0x7b, 0xe7, 0x79, 0x7e, 0x55, 0x15,
0x67, 0xac, 0xc4, 0x48, 0xe4, 0xe5, 0xcd, 0xb3, 0x4c, 0x94, 0x37, 0x01, 0xfe, 0x56, 0x21, 0x17,
0xe4, 0x00, 0xbc, 0xb8, 0x76, 0xf8, 0xce, 0x91, 0xf3, 0xd0, 0x0b, 0x5a, 0x03, 0x21, 0xb0, 0x9d,
0x85, 0x29, 0xfa, 0x23, 0xe5, 0x50, 0x6b, 0xfa, 0x0c, 0x0e, 0x86, 0x01, 0x79, 0x91, 0x67, 0x1c,
0xc9, 0x03, 0x18, 0xa3, 0x34, 0x28, 0xb4, 0xe9, 0xe9, 0x87, 0xc7, 0x35, 0x95, 0x63, 0x1d, 0xa7,
0xbd, 0xf4, 0x14, 0xc8, 0x39, 0xe3, 0x42, 0xda, 0x18, 0xf2, 0x77, 0xa2, 0x43, 0x7f, 0x80, 0x79,
0x27, 0xc7, 0x54, 0x7c, 0x04, 0x3b, 0xa8, 0x4d, 0xbe, 0x73, 0xe4, 0x0e, 0xd5, 0xac, 0xfd, 0xf4,
0x2f, 0x07, 0xc6, 0xca, 0xd4, 0xb4, 0xe6, 0xb4, 0xad, 0x91, 0xcf, 0x60, 0xc6, 0xf8, 0xb2, 0x25,
0x20, 0xdb, 0xde, 0x0d, 0xa6, 0x8c, 0x37, 0xad, 0x92, 0xaf, 0x60, 0x12, 0xfd, 0x5a, 0x65, 0x57,
0xdc, 0x77, 0x55, 0xa9, 0x79, 0x5b, 0xea, 0x47, 0x96, 0xe0, 0x53, 0xe9, 0x0b, 0x4c, 0x08, 0x79,
0x0c, 0x10, 0x0a, 0x51, 0xb2, 0xcb, 0x4a, 0x20, 0xf7, 0xb7, 0xd5, 0x79, 0xf8, 0x56, 0x42, 0xc5,
0xf1, 0x49, 0xe3, 0x0f, 0xac, 0x58, 0xba, 0x02, 0xaf, 0x81, 0x23, 0x9f, 0xc0, 0x8e, 0xcc, 0x59,
0xb2, 0xd8, 0xb0, 0x9d, 0xc8, 0xed, 0x8b, 0x98, 0xdc, 0x85, 0x49, 0xbe, 0x5a, 0x71, 0x14, 0x8a,
0xa9, 0x1b, 0x98, 0x9d, 0xec, 0x8d, 0xb3, 0x3f, 0xd0, 0x77, 0x8f, 0x9c, 0x87, 0xdb, 0x81, 0x5a,
0x93, 0x7d, 0x18, 0xa7, 0x82, 0xa5, 0xa8, 0x68, 0xb8, 0x81, 0xde, 0xd0, 0xbf, 0x1d, 0xf8, 0xa0,
0x4b, 0x83, 0xdc, 0x03, 0x4f, 0x55, 0x53, 0x08, 0x8e, 0x42, 0x50, 0xd3, 0xf4, 0xba, 0x83, 0x32,
0xb2, 0x50, 0x9a, 0x94, 0x34, 0x8f, 0x75, 0xd1, 0x3d, 0x9d, 0xf2, 0x32, 0x8f, 0x91, 0x7c, 0x04,
0x6e, 0xc5, 0x62, 0x55, 0x76, 0x2f, 0x90, 0x4b, 0x69, 0x59, 0xb3, 0xd8, 0x1f, 0x6b, 0xcb, 0x9a,
0xa9, 0x46, 0xa2, 0x52, 0xe1, 0x4e, 0x74, 0x23, 0x7a, 0x27, 0x1b, 0x49, 0xa5, 0x75, 0x47, 0x5f,
0x92, 0x5c, 0xd3, 0x35, 0x7c, 0xfa, 0x1c, 0xd5, 0x0c, 0xdc, 0x58, 0x87, 0x67, 0xe6, 0x67, 0xe8,
0x56, 0x0f, 0x01, 0x8a, 0xb0, 0xc4, 0x4c, 0xc8, 0x9b, 0x35, 0xa3, 0xec, 0x69, 0xcb, 0x19, 0x2b,
0xed, 0xd3, 0x75, 0xed, 0xd3, 0xa5, 0x7f, 0x3a, 0xb0, 0x18, 0xaa, 0x64, 0xa6, 0xae, 0x7b, 0xb9,
0xce, 0xbb, 0x5f, 0xae, 0x35, 0x43, 0xa3, 0xb7, 0xce, 0x10, 0x3d, 0x81, 0x3b, 0xcf, 0x51, 0x28,
0x7b, 0x9e, 0x09, 0xcc, 0x44, 0xdd, 0xea, 0xa6, 0xa9, 0xa0, 0xa7, 0x70, 0xf7, 0x76, 0x86, 0xa1,
0xec, 0xc3, 0x4e, 0xa4, 0x4d, 0x2a, 0x65, 0x16, 0xd4, 0x5b, 0xfa, 0x0b, 0x90, 0xa7, 0x25, 0x86,
0x02, 0xdf, 0x43, 0x1c, 0x9a, 0x87, 0x3e, 0x7a, 0xe3, 0x43, 0xbf, 0x03, 0xf3, 0x0e, 0xb4, 0xe6,
0x22, 0x2b, 0x5e, 0x14, 0xf1, 0xff, 0x55, 0xb1, 0x03, 0x6d, 0x2a, 0x32, 0x20, 0x67, 0x98, 0xe0,
0x7b, 0x55, 0x1c, 0x10, 0xc0, 0x9e, 0x4a, 0xb8, 0x3d, 0x95, 0x90, 0x0c, 0x3a, 0xa5, 0x0c, 0x83,
0x14, 0xe6, 0x4f, 0x38, 0x67, 0xeb, 0xec, 0xe7, 0x3c, 0xa9, 0x52, 0xac, 0x29, 0xec, 0xc3, 0x38,
0xca, 0x2b, 0x73, 0x29, 0xe3, 0x40, 0x6f, 0xc8, 0x7d, 0x80, 0x28, 0x4f, 0x12, 0x8c, 0x04, 0xcb,
0x33, 0x43, 0xc0, 0xb2, 0x90, 0x23, 0x98, 0x96, 0x58, 0x24, 0x2c, 0x0a, 0x55, 0x80, 0x9e, 0x5d,
0xdb, 0x44, 0xaf, 0x61, 0xbf, 0x5b, 0xce, 0x8c, 0xc1, 0x46, 0x3d, 0x91, 0x4f, 0xb5, 0x4c, 0x4c,
0x2d, 0xb9, 0x54, 0x6f, 0xa7, 0xba, 0x4c, 0x58, 0xb4, 0x94, 0x0e, 0xd7, 0xbc, 0x1d, 0x65, 0xb9,
0x28, 0x93, 0x96, 0xf9, 0xb6, 0xc5, 0x9c, 0x7e, 0x03, 0x73, 0xfd, 0x85, 0xe8, 0xb6, 0x79, 0x08,
0x70, 0xad, 0x0c, 0x4b, 0x16, 0x6b, 0xa5, 0xf6, 0x02, 0x4f, 0x5b, 0x5e, 0xc4, 0x9c, 0x7e, 0x0f,
0xde, 0x79, 0xae, 0x99, 0x73, 0x72, 0x02, 0x5e, 0x52, 0x6f, 0x8c, 0xa8, 0x93, 0xf6, 0xb6, 0xeb,
0xb8, 0xa0, 0x0d, 0xa2, 0xdf, 0xc1, 0x6e, 0x6d, 0xae, 0xfb, 0x70, 0x36, 0xf5, 0x31, 0xba, 0xd5,
0x07, 0xfd, 0xd7, 0x81, 0xfd, 0x2e, 0x65, 0x73, 0x54, 0x17, 0xb0, 0xd7, 0x94, 0x58, 0xa6, 0x61,
0x61, 0xb8, 0x9c, 0xd8, 0x5c, 0xfa, 0x69, 0x0d, 0x41, 0xfe, 0x32, 0x2c, 0xf4, 0x08, 0xcc, 0x12,
0xcb, 0xb4, 0xf8, 0x09, 0x3e, 0xee, 0x85, 0x48, 0xd6, 0x57, 0x58, 0xcf, 0xa0, 0x5c, 0x92, 0x47,
0x30, 0xbe, 0x0e, 0x93, 0x0a, 0xcd, 0xbc, 0xcf, 0xfb, 0x27, 0xc0, 0x03, 0x1d, 0xf1, 0xed, 0xe8,
0xb1, 0x73, 0xfa, 0xcf, 0x18, 0x66, 0xaf, 0x31, 0xfc, 0x1d, 0x31, 0x96, 0xaf, 0xbf, 0x24, 0xeb,
0xba, 0xab, 0xee, 0xa7, 0x9a, 0x3c, 0xb8, 0x4d, 0x7f, 0xf0, 0xdf, 0x60, 0xf1, 0xe5, 0xdb, 0xc2,
0xcc, 0x58, 0x6f, 0x91, 0x73, 0x98, 0x5a, 0x1f, 0x66, 0x72, 0x60, 0x25, 0xf6, 0xbe, 0xf1, 0x8b,
0xc3, 0x0d, 0xde, 0x06, 0x2d, 0x04, 0xd2, 0xd7, 0x5d, 0xf2, 0x79, 0x9b, 0xb6, 0x51, 0xff, 0x17,
0x5f, 0xbc, 0x39, 0xc8, 0x26, 0x6c, 0x89, 0x92, 0x4d, 0xb8, 0x2f, 0x83, 0x36, 0xe1, 0x21, 0x25,
0x53, 0x68, 0x96, 0xe0, 0xd8, 0x68, 0x7d, 0x89, 0xb3, 0xd1, 0x86, 0x54, 0x4a, 0xa1, 0x59, 0xe2,
0x61, 0xa3, 0xf5, 0xe5, 0xcb, 0x46, 0x1b, 0x52, 0x9c, 0x2d, 0xf2, 0x0a, 0x66, 0xb6, 0x08, 0x10,
0x2b, 0x61, 0x40, 0x8b, 0x16, 0xf7, 0x37, 0xb9, 0x6d, 0x40, 0x7b, 0xe6, 0x6d, 0xc0, 0x81, 0x57,
0x6f, 0x03, 0x0e, 0x3d, 0x15, 0xba, 0x75, 0x39, 0x51, 0xbf, 0xac, 0x5f, 0xff, 0x17, 0x00, 0x00,
0xff, 0xff, 0xf1, 0x42, 0x51, 0xbb, 0xc1, 0x0a, 0x00, 0x00,
// 931 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xdc, 0x44,
0x14, 0x8e, 0xd7, 0xd9, 0x4d, 0x7c, 0x76, 0x53, 0x60, 0x36, 0x2d, 0x66, 0x9b, 0x54, 0x61, 0x68,
0x51, 0x2b, 0xa4, 0x28, 0x0a, 0x5c, 0x54, 0x20, 0x24, 0xaa, 0xa6, 0x54, 0x95, 0x52, 0x55, 0x72,
0x09, 0x12, 0x57, 0x2b, 0xc7, 0x3e, 0x59, 0x46, 0xf1, 0x1f, 0x9e, 0x71, 0x50, 0xb8, 0xe5, 0x01,
0x78, 0x0a, 0xee, 0xb9, 0xe0, 0x0d, 0x78, 0x31, 0x34, 0x3f, 0xb6, 0xc7, 0xb1, 0xb7, 0x3f, 0x17,
0xbd, 0x9b, 0x39, 0x3f, 0xdf, 0xf9, 0xce, 0xcc, 0x99, 0xcf, 0x86, 0xe9, 0x05, 0x4b, 0xb0, 0x3c,
0x2c, 0xca, 0x5c, 0xe4, 0x64, 0x5b, 0x6d, 0x96, 0xc5, 0x39, 0x7d, 0x05, 0x77, 0x4f, 0xf3, 0xfc,
0xb2, 0x2a, 0x4e, 0x58, 0x89, 0x91, 0xc8, 0xcb, 0xeb, 0x67, 0x99, 0x28, 0xaf, 0x03, 0xfc, 0xad,
0x42, 0x2e, 0xc8, 0x1e, 0x78, 0x71, 0xed, 0xf0, 0x9d, 0x03, 0xe7, 0xa1, 0x17, 0xb4, 0x06, 0x42,
0x60, 0x33, 0x0b, 0x53, 0xf4, 0x47, 0xca, 0xa1, 0xd6, 0xf4, 0x19, 0xec, 0x0d, 0x03, 0xf2, 0x22,
0xcf, 0x38, 0x92, 0x07, 0x30, 0x46, 0x69, 0x50, 0x68, 0xd3, 0xe3, 0x8f, 0x0e, 0x6b, 0x2a, 0x87,
0x3a, 0x4e, 0x7b, 0xe9, 0x31, 0x90, 0x53, 0xc6, 0x85, 0xb4, 0x31, 0xe4, 0xef, 0x44, 0x87, 0xfe,
0x00, 0xf3, 0x4e, 0x8e, 0xa9, 0xf8, 0x08, 0xb6, 0x50, 0x9b, 0x7c, 0xe7, 0xc0, 0x1d, 0xaa, 0x59,
0xfb, 0xe9, 0xdf, 0x0e, 0x8c, 0x95, 0xa9, 0x69, 0xcd, 0x69, 0x5b, 0x23, 0x9f, 0xc3, 0x8c, 0xf1,
0x65, 0x4b, 0x40, 0xb6, 0xbd, 0x1d, 0x4c, 0x19, 0x6f, 0x5a, 0x25, 0x5f, 0xc1, 0x24, 0xfa, 0xb5,
0xca, 0x2e, 0xb9, 0xef, 0xaa, 0x52, 0xf3, 0xb6, 0xd4, 0x8f, 0x2c, 0xc1, 0xa7, 0xd2, 0x17, 0x98,
0x10, 0xf2, 0x18, 0x20, 0x14, 0xa2, 0x64, 0xe7, 0x95, 0x40, 0xee, 0x6f, 0xaa, 0xf3, 0xf0, 0xad,
0x84, 0x8a, 0xe3, 0x93, 0xc6, 0x1f, 0x58, 0xb1, 0xf4, 0x02, 0xbc, 0x06, 0x8e, 0x7c, 0x0a, 0x5b,
0x32, 0x67, 0xc9, 0x62, 0xc3, 0x76, 0x22, 0xb7, 0x2f, 0x62, 0x72, 0x07, 0x26, 0xf9, 0xc5, 0x05,
0x47, 0xa1, 0x98, 0xba, 0x81, 0xd9, 0xc9, 0xde, 0x38, 0xfb, 0x03, 0x7d, 0xf7, 0xc0, 0x79, 0xb8,
0x19, 0xa8, 0x35, 0xd9, 0x85, 0x71, 0x2a, 0x58, 0x8a, 0x8a, 0x86, 0x1b, 0xe8, 0x0d, 0xfd, 0xc7,
0x81, 0x5b, 0x5d, 0x1a, 0xe4, 0x2e, 0x78, 0xaa, 0x9a, 0x42, 0x70, 0x14, 0x82, 0x9a, 0xa6, 0xd7,
0x1d, 0x94, 0x91, 0x85, 0xd2, 0xa4, 0xa4, 0x79, 0xac, 0x8b, 0xee, 0xe8, 0x94, 0x97, 0x79, 0x8c,
0xe4, 0x63, 0x70, 0x2b, 0x16, 0xab, 0xb2, 0x3b, 0x81, 0x5c, 0x4a, 0xcb, 0x8a, 0xc5, 0xfe, 0x58,
0x5b, 0x56, 0x4c, 0x35, 0x12, 0x95, 0x0a, 0x77, 0xa2, 0x1b, 0xd1, 0x3b, 0xd9, 0x48, 0x2a, 0xad,
0x5b, 0xfa, 0x92, 0xe4, 0x9a, 0xae, 0xe0, 0xb3, 0xe7, 0xa8, 0x66, 0xe0, 0xda, 0x3a, 0x3c, 0x33,
0x3f, 0x43, 0xb7, 0xba, 0x0f, 0x50, 0x84, 0x25, 0x66, 0x42, 0xde, 0xac, 0x19, 0x65, 0x4f, 0x5b,
0x4e, 0x58, 0x69, 0x9f, 0xae, 0x6b, 0x9f, 0x2e, 0xfd, 0xd3, 0x81, 0xc5, 0x50, 0x25, 0x33, 0x75,
0xdd, 0xcb, 0x75, 0xde, 0xfd, 0x72, 0xad, 0x19, 0x1a, 0xbd, 0x75, 0x86, 0xe8, 0x11, 0xdc, 0x7e,
0x8e, 0x42, 0xd9, 0xf3, 0x4c, 0x60, 0x26, 0xea, 0x56, 0xd7, 0x4d, 0x05, 0x3d, 0x86, 0x3b, 0x37,
0x33, 0x0c, 0x65, 0x1f, 0xb6, 0x22, 0x6d, 0x52, 0x29, 0xb3, 0xa0, 0xde, 0xd2, 0x5f, 0x80, 0x3c,
0x2d, 0x31, 0x14, 0xf8, 0x1e, 0xe2, 0xd0, 0x3c, 0xf4, 0xd1, 0x1b, 0x1f, 0xfa, 0x6d, 0x98, 0x77,
0xa0, 0x35, 0x17, 0x59, 0xf1, 0xac, 0x88, 0x3f, 0x54, 0xc5, 0x0e, 0xb4, 0xa9, 0xf8, 0x97, 0x03,
0xe4, 0x04, 0x13, 0x7c, 0xaf, 0x92, 0x03, 0x0a, 0xd8, 0x93, 0x09, 0xb7, 0x2f, 0x13, 0xf7, 0xe1,
0x96, 0x0c, 0x51, 0xd5, 0x96, 0x71, 0x28, 0x42, 0x35, 0xff, 0xdb, 0xc1, 0x8c, 0x71, 0x4d, 0xe1,
0x24, 0x14, 0xa1, 0x24, 0xda, 0x21, 0x64, 0x88, 0xa6, 0x30, 0x7f, 0xc2, 0x39, 0x5b, 0x65, 0x3f,
0xe7, 0x49, 0x95, 0x62, 0x4d, 0x74, 0x17, 0xc6, 0x51, 0x5e, 0x99, 0xbb, 0x1b, 0x07, 0x7a, 0x43,
0xee, 0x01, 0x44, 0x79, 0x92, 0x60, 0x24, 0x58, 0x9e, 0x19, 0x9a, 0x96, 0x85, 0x1c, 0xc0, 0xb4,
0xc4, 0x22, 0x61, 0x51, 0xa8, 0x02, 0xf4, 0x88, 0xdb, 0x26, 0x7a, 0x05, 0xbb, 0xdd, 0x72, 0x66,
0x5a, 0xd6, 0xca, 0x8e, 0x7c, 0xd1, 0x65, 0x62, 0x6a, 0xc9, 0xa5, 0x7a, 0x62, 0xd5, 0x79, 0xc2,
0xa2, 0xa5, 0x74, 0xb8, 0xe6, 0x89, 0x29, 0xcb, 0x59, 0x99, 0xb4, 0xcc, 0x37, 0x2d, 0xe6, 0xf4,
0x1b, 0x98, 0xeb, 0x0f, 0x49, 0xb7, 0xcd, 0x7d, 0x80, 0x2b, 0x65, 0x58, 0xb2, 0x58, 0x0b, 0xba,
0x17, 0x78, 0xda, 0xf2, 0x22, 0xe6, 0xf4, 0x7b, 0xf0, 0x4e, 0x73, 0xcd, 0x9c, 0x93, 0x23, 0xf0,
0x92, 0x7a, 0x63, 0xb4, 0x9f, 0xb4, 0x43, 0x51, 0xc7, 0x05, 0x6d, 0x10, 0xfd, 0x0e, 0xb6, 0x6b,
0x73, 0xdd, 0x87, 0xb3, 0xae, 0x8f, 0xd1, 0x8d, 0x3e, 0xe8, 0x7f, 0x0e, 0xec, 0x76, 0x29, 0x9b,
0xa3, 0x3a, 0x83, 0x9d, 0xa6, 0xc4, 0x32, 0x0d, 0x0b, 0xc3, 0xe5, 0xc8, 0xe6, 0xd2, 0x4f, 0x6b,
0x08, 0xf2, 0x97, 0x61, 0xa1, 0x47, 0x60, 0x96, 0x58, 0xa6, 0xc5, 0x4f, 0xf0, 0x49, 0x2f, 0x44,
0xb2, 0xbe, 0xc4, 0x7a, 0x52, 0xe5, 0x92, 0x3c, 0x82, 0xf1, 0x55, 0x98, 0x54, 0x68, 0x9e, 0xc5,
0xbc, 0x7f, 0x02, 0x3c, 0xd0, 0x11, 0xdf, 0x8e, 0x1e, 0x3b, 0xc7, 0xff, 0x8e, 0x61, 0xf6, 0x1a,
0xc3, 0xdf, 0x11, 0x63, 0x29, 0x12, 0x25, 0x59, 0xd5, 0x5d, 0x75, 0xbf, 0xe8, 0xe4, 0xc1, 0x4d,
0xfa, 0x83, 0xbf, 0x10, 0x8b, 0x2f, 0xdf, 0x16, 0x66, 0xc6, 0x7a, 0x83, 0x9c, 0xc2, 0xd4, 0xfa,
0x7e, 0x93, 0x3d, 0x2b, 0xb1, 0xf7, 0x2b, 0xb0, 0xd8, 0x5f, 0xe3, 0x6d, 0xd0, 0x42, 0x20, 0x7d,
0x79, 0x26, 0x5f, 0xb4, 0x69, 0x6b, 0x3f, 0x13, 0x8b, 0xfb, 0x6f, 0x0e, 0xb2, 0x09, 0x5b, 0xda,
0x65, 0x13, 0xee, 0xab, 0xa5, 0x4d, 0x78, 0x48, 0xf0, 0x14, 0x9a, 0xa5, 0x4b, 0x36, 0x5a, 0x5f,
0x09, 0x6d, 0xb4, 0x21, 0x31, 0x53, 0x68, 0x96, 0x78, 0xd8, 0x68, 0x7d, 0x91, 0xb3, 0xd1, 0x86,
0x14, 0x67, 0x83, 0xbc, 0x82, 0x99, 0x2d, 0x02, 0xc4, 0x4a, 0x18, 0xd0, 0xa2, 0xc5, 0xbd, 0x75,
0x6e, 0x1b, 0xd0, 0x9e, 0x79, 0x1b, 0x70, 0xe0, 0xd5, 0xdb, 0x80, 0x43, 0x4f, 0x85, 0x6e, 0x9c,
0x4f, 0xd4, 0x9f, 0xed, 0xd7, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xed, 0xc4, 0xbe, 0xe8,
0x0a, 0x00, 0x00,
}

11
weed/server/filer_grpc_server.go
View File

@ -24,7 +24,14 @@ func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.L
Entry: &filer_pb.Entry{
Name: req.Name,
IsDirectory: entry.IsDirectory(),
Chunks: entry.Chunks,
Attributes: &filer_pb.FuseAttributes{
Mtime: entry.Attr.Mtime.Unix(),
Crtime: entry.Attr.Crtime.Unix(),
FileMode: uint32(entry.Attr.Mode),
Uid: entry.Attr.Uid,
Gid: entry.Attr.Gid,
},
Chunks: entry.Chunks,
},
}, nil
}
@ -184,7 +191,7 @@ func (fs *FilerServer) UpdateEntry(ctx context.Context, req *filer_pb.UpdateEntr
}
func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntryRequest) (resp *filer_pb.DeleteEntryResponse, err error) {
err = fs.filer.DeleteEntryMetaAndData(filer2.FullPath(filepath.Join(req.Directory, req.Name)))
err = fs.filer.DeleteEntryMetaAndData(filer2.FullPath(filepath.Join(req.Directory, req.Name)), req.IsDeleteData)
return &filer_pb.DeleteEntryResponse{}, err
}

2
weed/server/filer_server_handlers_write.go
View File

@ -195,7 +195,7 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) {
// curl -X DELETE http://localhost:8888/path/to
func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
err := fs.filer.DeleteEntryMetaAndData(filer2.FullPath(r.URL.Path))
err := fs.filer.DeleteEntryMetaAndData(filer2.FullPath(r.URL.Path), true)
if err != nil {
glog.V(4).Infoln("deleting", r.URL.Path, ":", err.Error())
writeJsonError(w, r, http.StatusInternalServerError, err)