mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the panic exit out of logger maybe fsync closes[t:2376]

Browse source 
git-svn-id: file:///svn/toku/tokudb@17857 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-16 23:59:00 -04:00 • committed by Yoni Fogel
parent 081fe6767e
commit 92a9fdcf65
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
newbrt/logger.c
View file

@ -446,9 +446,10 @@ int toku_logger_maybe_fsync (TOKULOGGER logger, LSN lsn, int do_fsync)
// need to fsync and not enough is done
// reacquire the locks (acquire output lock first)
r = ml_unlock(&logger->input_lock); if (r!=0) goto panic;
have_input_lock = FALSE;
r = ml_lock(&logger->output_lock); if (r!=0) goto panic;
r = ml_lock(&logger->input_lock); if (r!=0) goto panic;
have_input_lock = TRUE;
// it's possible that the written lsn is now written enough that we are happy. If not then do the I/O
if (logger->fsynced_lsn.lsn < lsn.lsn) {
@ -483,12 +484,16 @@ int toku_logger_maybe_fsync (TOKULOGGER logger, LSN lsn, int do_fsync)
if (have_input_lock) {
r = ml_unlock(&logger->input_lock);
if (r!=0) goto panic2;
have_input_lock = FALSE;
}
if ( logger->write_log_files )
toku_logfilemgr_update_last_lsn(logger->logfilemgr, logger->written_lsn);
return 0;
panic:
ml_unlock(&logger->input_lock);
if (have_input_lock) {
ml_unlock(&logger->input_lock);
have_input_lock = FALSE;
}
panic2:
toku_logger_panic(logger, r);
return r;