Skip to content

[FileSystem] Avoid race condition when two scenes try to create config dir in same time #5752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epernod merged 5 commits into from
Nov 14, 2025
Merged

[FileSystem] Avoid race condition when two scenes try to create config dir in same time #5752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fcd146
If mkdir returns 'folder already exists' then all good.
bakpaul Oct 28, 2025
d8fb14c
Now if path already exists and is actually a folder then throw no error
bakpaul Oct 30, 2025
1c87c0e
Merge branch 'master' into 25_10_avoid_race_condition_when_launching_…
bakpaul Nov 12, 2025
40872bd
Forgot fallback
bakpaul Nov 12, 2025
104c987
Merge branch 'master' into 25_10_avoid_race_condition_when_launching_…
hugtalbot Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions Sofa/framework/Helper/src/sofa/helper/system/FileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,30 @@ bool FileSystem::createDirectory(const std::string& path)
return true;
}
#else
if (mkdir(path.c_str(), 0755))
int status = mkdir(path.c_str(), 0755);
if(status)
{
msg_error(error) << path << ": " << strerror(errno);
return true;
if (errno != EEXIST)
{
msg_error(error) << path << ": " << strerror(errno);
return true;
}
else
{
struct stat st_buf;
if (stat(path.c_str(), &st_buf) == 0)
{
if ((st_buf.st_mode & S_IFMT) != S_IFDIR) {
msg_error(error) << path << ": File exists and is not a directoy";
return true;
}
else
{
return false;
}
}

}
}
#endif
else
Expand Down
22 changes: 10 additions & 12 deletions Sofa/framework/Helper/test/system/FileSystem_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,16 @@ TEST(FileSystemTest, createDirectory_alreadyExists)
// required to be able to use EXPECT_MSG_NOEMIT and EXPECT_MSG_EMIT
sofa::helper::logging::MessageDispatcher::addHandler(sofa::testing::MainGtestMessageHandler::getInstance() ) ;

{
EXPECT_MSG_NOEMIT(Error) ;
FileSystem::createDirectory("createDirectoryTestDir");
}
{
EXPECT_MSG_EMIT(Error) ;
EXPECT_TRUE(FileSystem::createDirectory("createDirectoryTestDir"));
}
{
EXPECT_MSG_NOEMIT(Error) ;
FileSystem::removeDirectory("createDirectoryTestDir");
}
EXPECT_MSG_NOEMIT(Error) ;

EXPECT_FALSE(FileSystem::createDirectory("createDirectoryTestDir"));
EXPECT_TRUE(FileSystem::exists("createDirectoryTestDir"));
EXPECT_TRUE(FileSystem::isDirectory("createDirectoryTestDir"));
EXPECT_FALSE(FileSystem::createDirectory("createDirectoryTestDir"));

// Cleanup
FileSystem::removeDirectory("createDirectoryTestDir");

}

TEST(FileSystemTest, removeDirectory)
Expand Down