octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-04-03 15:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DeadLock in FdManager::ChangeEntityToTempPath (#2455)

Browse Source 
commit e3b50ad introduce smart pointer to manage FdEntity

But in ChangeEntityToTempPath, we should not destroy the entity.

We should move the entry to the temp ky

Signed-off-by: liubingrun <liubr1@chinatelecom.cn>
This commit is contained in:
LiuBingrun 2024-05-11 10:29:40 +08:00 committed by GitHub
parent 3864f58c22
commit ccdcccd44c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fdcache.cpp
View File

@ -775,7 +775,7 @@ bool FdManager::Close(FdEntity* ent, int fd)
return false; return false;
} }
bool FdManager::ChangeEntityToTempPath(FdEntity* ent, const char* path) bool FdManager::ChangeEntityToTempPath(const FdEntity* ent, const char* path)
{ {
AutoLock auto_lock(&FdManager::fd_manager_lock); AutoLock auto_lock(&FdManager::fd_manager_lock);
@ -783,8 +783,10 @@ bool FdManager::ChangeEntityToTempPath(FdEntity* ent, const char* path)
if(iter->second.get() == ent){ if(iter->second.get() == ent){
std::string tmppath; std::string tmppath;
FdManager::MakeRandomTempPath(path, tmppath); FdManager::MakeRandomTempPath(path, tmppath);
iter->second.reset(ent); // Move the entry to the new key
break; fent[tmppath] = std::move(iter->second);
iter = fent.erase(iter);
return true;
}else{ }else{
++iter; ++iter;
} }

2
src/fdcache.h
View File

@ -96,7 +96,7 @@ class FdManager
FdEntity* OpenExistFdEntity(const char* path, int& fd, int flags = O_RDONLY); FdEntity* OpenExistFdEntity(const char* path, int& fd, int flags = O_RDONLY);
void Rename(const std::string &from, const std::string &to); void Rename(const std::string &from, const std::string &to);
bool Close(FdEntity* ent, int fd); bool Close(FdEntity* ent, int fd);
bool ChangeEntityToTempPath(FdEntity* ent, const char* path); bool ChangeEntityToTempPath(const FdEntity* ent, const char* path);
void CleanupCacheDir(); void CleanupCacheDir();
bool CheckAllCache(); bool CheckAllCache();