gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

rename operation returns the correct old parent path

Browse source
This commit is contained in:
liubaojiang 2021-12-10 00:02:57 +08:00
parent 40ee9b4d7b
commit c7abc34dbb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/filesys/dir_rename.go
View file

@ -111,7 +111,7 @@ func (dir *Dir) handleRenameResponse(ctx context.Context, resp *filer_pb.StreamR
// change file handle // change file handle
inodeId := oldPath.AsInode() inodeId := oldPath.AsInode()
dir.wfs.handlesLock.Lock() dir.wfs.handlesLock.Lock()
if existingHandle, found := dir.wfs.handles[inodeId]; found && existingHandle == nil { if existingHandle, found := dir.wfs.handles[inodeId]; found && existingHandle != nil {
glog.V(4).Infof("opened file handle %s => %s", oldPath, newPath) glog.V(4).Infof("opened file handle %s => %s", oldPath, newPath)
delete(dir.wfs.handles, inodeId) delete(dir.wfs.handles, inodeId)
dir.wfs.handles[newPath.AsInode()] = existingHandle dir.wfs.handles[newPath.AsInode()] = existingHandle

2
weed/server/filer_grpc_server_rename.go
View file

@ -159,7 +159,7 @@ func (fs *FilerServer) moveSelfEntry(ctx context.Context, stream filer_pb.Seawee
} }
if stream != nil { if stream != nil {
if err := stream.Send(&filer_pb.StreamRenameEntryResponse{ if err := stream.Send(&filer_pb.StreamRenameEntryResponse{
Directory: string(newParent), Directory: string(oldParent),
EventNotification: &filer_pb.EventNotification{ EventNotification: &filer_pb.EventNotification{
OldEntry: &filer_pb.Entry{ OldEntry: &filer_pb.Entry{
Name: entry.Name(), Name: entry.Name(),