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

fix stolen fd bug.

Browse Source
This commit is contained in:
Matt Wells
2015-08-20 20:07:30 -07:00
parent d4468c8d66
commit ad695c001a
3 changed files with 25 additions and 7 deletions

2
BigFile.cpp

@ -1269,7 +1269,7 @@ bool readwrite_r ( FileState *fstate , ThreadEntry *t ) {
// may have been called by RdbMerge and our m_files may be
// altered
log("disk::readwrite: %s %i bytes of %i @ offset %i "
"from %s(nonBlock=%s) fd %i "
"from BASEfile=%s (nonBlock=%s) fd %i "
"cc1=%i=?%i cc2=%i=?%i errno=%s",
s,n,len,localOffset,
fstate->m_this->getFilename(),

28
File.cpp

@ -609,6 +609,17 @@ int File::getfd () {
char *xx=NULL; *xx=0;
return -2;
}
// if someone closed our fd, why didn't our m_fd get set to -1 ??!?!?!!
if ( m_fd >= 0 && m_closeCount != s_closeCounts[m_fd] ) {
log(LOG_DEBUG,"disk: invalidating existing fd %i "
"for %s this=0x%"PTRFMT" ccSaved=%i ccNow=%i",
(int)m_fd,getFilename(),(PTRTYPE)this,
(int)m_closeCount,
(int)s_closeCounts[m_fd]);
m_fd = -1;
}
// . sanity check
// . no caller should call open/getfd after unlink was queued for thred
//if ( m_gone ) { char *xx = NULL; *xx = 0; }
@ -617,8 +628,12 @@ int File::getfd () {
// return true if it's already opened
if ( m_fd >= 0 ) {
// debug msg
log(LOG_DEBUG,"disk: returning existing fd %i for %s",
(int)m_fd,getFilename());
if ( g_conf.m_logDebugDisk )
log(LOG_DEBUG,"disk: returning existing fd %i for %s "
"this=0x%"PTRFMT" ccSaved=%i ccNow=%i",
(int)m_fd,getFilename(),(PTRTYPE)this,
(int)m_closeCount,
(int)s_closeCounts[m_fd]);
if ( m_fd >= MAX_NUM_FDS ) { char *xx=NULL;*xx=0; }
// but update the timestamp to reduce chance it closes on us
//s_timestamps [ m_vfd ] = getTime();
@ -678,8 +693,11 @@ int File::getfd () {
File *f = s_filePtrs [ fd ];
if ( g_conf.m_logDebugDisk )
log("disk: swiping fd %i from %s before "
"his close thread returned",fd,
f->getFilename());
"his close thread returned "
"this=0x%"PTRFMT,
fd,
f->getFilename(),
(PTRTYPE)f);
// he only incs/decs his counters if he owns it so in
// close2() so dec this global counter here
s_numOpenFiles--;
@ -900,7 +918,7 @@ bool File::closeLeastUsed () {
if ( f ) fname = f->getFilename();
logf(LOG_DEBUG,"disk: force closed fd %i for"
" %s. age=%"INT64" #openfiles=%i this=0x%"PTRFMT,
mini,fname,now-s_timestamps[mini],
fd,fname,now-s_timestamps[mini],
(int)s_numOpenFiles,
(PTRTYPE)this);
}

2
Log.cpp

@ -367,7 +367,7 @@ bool Log::logR ( int64_t now , int32_t type , char *msg , bool asterisk ,
// . if filesize would be too big then make a new log file
// . should make a new m_fd
if ( m_logFileSize + tlen+1 > MAXLOGFILESIZE )
if ( m_logFileSize + tlen+1 > MAXLOGFILESIZE && g_conf.m_runAsDaemon )
makeNewLogFile();
if ( m_fd >= 0 ) {