Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix lock file error handling, improve error messages

This commit is contained in:
Wilfried Goesgens 2017-03-29 12:22:08 +02:00
parent 0bf00036c6
commit 619713c596
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arangod/RestServer/LockfileFeature.cpp
View File

@ -48,27 +48,32 @@ void LockfileFeature::start() {
int res = TRI_VerifyLockFile(_lockFilename.c_str()); int res = TRI_VerifyLockFile(_lockFilename.c_str());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
LOG_TOPIC(FATAL, arangodb::Logger::FIXME) << "database is locked, please check the lock file '" << _lockFilename << "'"; std::string otherPID;
try {
otherPID = FileUtils::slurp(_lockFilename.c_str());
}
catch (...) {}
LOG_TOPIC(FATAL, arangodb::Logger::FIXME) << "database is locked by process " <<
otherPID << "; please stop it and remove the lock file '" << _lockFilename << "'";
FATAL_ERROR_EXIT(); FATAL_ERROR_EXIT();
} }
if (TRI_ExistsFile(_lockFilename.c_str())) { if (TRI_ExistsFile(_lockFilename.c_str())) {
TRI_UnlinkFile(_lockFilename.c_str()); res = TRI_UnlinkFile(_lockFilename.c_str());
}
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
LOG_TOPIC(FATAL, arangodb::Logger::FIXME) LOG_TOPIC(FATAL, arangodb::Logger::FIXME)
<< "cannot lock the database directory, please check the lock file '" << "failed to remove an abandoned lock file in the database directory, please check the file permissions on the lock file '"
<< _lockFilename << "': " << TRI_errno_string(res); << _lockFilename << "': " << TRI_errno_string(res);
FATAL_ERROR_EXIT(); FATAL_ERROR_EXIT();
}
} }
res = TRI_CreateLockFile(_lockFilename.c_str()); res = TRI_CreateLockFile(_lockFilename.c_str());
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
LOG_TOPIC(FATAL, arangodb::Logger::FIXME) LOG_TOPIC(FATAL, arangodb::Logger::FIXME)
<< "cannot lock the database directory, please check the lock file '" << "failed to lock the database directory using "
<< _lockFilename << "': " << TRI_errno_string(res); << _lockFilename << "': " << TRI_errno_string(res);
FATAL_ERROR_EXIT(); FATAL_ERROR_EXIT();
} }
} }