gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mount: delete target entry first during move

Browse Source
This commit is contained in:
chrislu
2022-06-20 13:15:02 -07:00
parent 625fd16a2e
commit 76f26c4b99
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
weed/mount/inode_to_path.go
View File

@@ -157,6 +157,10 @@ func (i *InodeToPath) MovePath(sourcePath, targetPath util.FullPath) (replacedIn
defer i.Unlock() defer i.Unlock()
sourceInode, sourceFound := i.path2inode[sourcePath] sourceInode, sourceFound := i.path2inode[sourcePath]
targetInode, targetFound := i.path2inode[targetPath] targetInode, targetFound := i.path2inode[targetPath]
if targetFound {
delete(i.inode2path, targetInode)
delete(i.path2inode, targetPath)
}
if sourceFound { if sourceFound {
delete(i.path2inode, sourcePath) delete(i.path2inode, sourcePath)
i.path2inode[targetPath] = sourceInode i.path2inode[targetPath] = sourceInode
@@ -165,11 +169,14 @@ func (i *InodeToPath) MovePath(sourcePath, targetPath util.FullPath) (replacedIn
// so no need to worry about their source inodes // so no need to worry about their source inodes
return return
} }
i.inode2path[sourceInode].FullPath = targetPath if entry, entryFound := i.inode2path[sourceInode]; entryFound {
if targetFound { entry.FullPath = targetPath
delete(i.inode2path, targetInode) entry.isChildrenCached = false
if !targetFound {
entry.nlookup++
}
} else { } else {
i.inode2path[sourceInode].nlookup++ glog.Errorf("MovePath %s to %s: sourceInode %s not found", sourcePath, targetPath, sourceInode)
} }
return targetInode return targetInode
} }