lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-17 09:42:29 +08:00
Code Issues Actions 32 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
Download Patch File Download Diff File Expand all files Collapse all files

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)