Mirrors/privacore-open-source-search-engine
1
0
Fork 1
mirror of https://github.com/privacore/open-source-search-engine.git synced 2025-07-12 02:26:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add more trace logs

Browse Source
This commit is contained in:
Ai Lin Chia
2016-12-30 12:27:44 +01:00
parent 249d52b9b2
commit 7e4914bb10
2 changed files with 17 additions and 6 deletions

2
BigFile.cpp

@ -1664,7 +1664,7 @@ void BigFile::doneP1RenameWrapper(File *f) {
// otherwise, it's a more serious error i guess
if ( g_errno ) {
m_latestsRenameP1Errno = g_errno;
log(LOG_ERROR, "%s:%s:%d: doneRenameWrapper. rename failed: [%s] [%s]", __FILE__, __func__, __LINE__, getFilename(), mstrerror(g_errno));
logError("doneRenameWrapper. rename failed: [%s] [%s]", getFilename(), mstrerror(g_errno));
logAllData(LOG_ERROR);
//@@@ BR: Why continue??
}

21
File.cpp

@ -169,28 +169,39 @@ bool File::rename ( const char *newFilename ) {
bool File::movePhase1(const char *newFilename) {
logTrace(g_conf.m_logTraceFile, "BEGIN oldFilename='%s' newFilename='%s'", getFilename(), newFilename);
if(::access( newFilename,F_OK) == 0) {
log(LOG_ERROR, "%s:%s:%d: disk: trying to rename [%s] to [%s] which exists.", __FILE__, __func__, __LINE__,
getFilename(), newFilename);
logError("disk: trying to rename [%s] to [%s] which exists.", getFilename(), newFilename);
gbshutdownLogicError();
}
if(moveFile2Phase1(getFilename(), newFilename) != 0)
if(moveFile2Phase1(getFilename(), newFilename) != 0) {
logTrace(g_conf.m_logTraceFile, "END newFilename='%s'. Returning false", newFilename);
return false;
}
logTrace(g_conf.m_logTraceFile, "END newFilename='%s'. Returning true", newFilename);
return true;
}
bool File::movePhase2(const char *newFilename) {
if(moveFile2Phase2(getFilename(), newFilename) != 0)
logTrace(g_conf.m_logTraceFile, "BEGIN oldFilename='%s' newFilename='%s'", getFilename(), newFilename);
if(moveFile2Phase2(getFilename(), newFilename) != 0) {
logTrace(g_conf.m_logTraceFile, "END newFilename='%s'. Returning false", newFilename);
return false;
}
set(newFilename);
close(); //ensure that we release the original file if the move was across filesystems
logTrace(g_conf.m_logTraceFile, "END newFilename='%s'. Returning true", newFilename);
return true;
}
void File::rollbackMovePhase1(const char *newFilename) {
if(::unlink(newFilename)!=0) {
log(LOG_ERROR, "%s:%s:%d: disk: trying to rollback renmae-phase1 [%s] to [%s], unlink() failed with errno=%d.", __FILE__, __func__, __LINE__,
log(LOG_ERROR, "%s:%s:%d: disk: trying to rollback rename-phase1 [%s] to [%s], unlink() failed with errno=%d.", __FILE__, __func__, __LINE__,
getFilename(), newFilename, errno);
}
//yes, we return void because when a rollback doesn't work then there isn't much we can do