mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

Use File::write() rather than mmap in RecoveryJob. This is 20% faster on linux

Browse Source
This commit is contained in:
Mathias Stearn 2010-12-22 01:42:52 -05:00
parent 94094cf0d3
commit 86216e47f9
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
db/dur_recover.cpp
View File

@ -33,6 +33,9 @@
#include "cmdline.h"
#include "curop.h"
#include <sys/stat.h>
#include <fcntl.h>
using namespace mongoutils;
namespace mongo {
@ -168,15 +171,13 @@ namespace mongo {
};
/** retrieve the mmap pointer for the specified dbName plus file number.
/** retrieve the file for the specified dbName plus file number.
open if not yet open.
*/
void* RecoveryJob::ptr(const char *dbName, int fileNo, unsigned ofs) {
void *&p = _fileToPtr[ pair<int,string>(fileNo,dbName) ];
File& RecoveryJob::getFile(const char *dbName, int fileNo) {
File &file = _files[ make_pair(fileNo,dbName) ];
if( p == 0 ) {
MemoryMappedFile *f = new MemoryMappedFile();
_files.push_back( shared_ptr<MemoryMappedFile>(f) );
if(!file.is_open()) {
string fn;
{
stringstream ss;
@ -193,24 +194,30 @@ namespace mongo {
*/
fn = ss.str();
}
path full(dbpath);
try {
// relative name -> full path name
full /= fn;
p = f->map(full.string().c_str());
file.open(full.string().c_str());
}
catch(DBException&) {
log() << "recover error opening file " << full.string() << endl;
throw;
}
uassert(13534, str::stream() << "recovery error couldn't open " << fn, p);
uassert(13534, str::stream() << "recovery error couldn't open " << fn, file.is_open());
//TODO(mathias) add length method to File and enable these asserts
// They are less important now that we are using write() rather than mmap
#if 0
if( cmdLine.durOptions & CmdLine::DurDumpJournal )
log() << " opened " << fn << ' ' << f->length()/1024.0/1024.0 << endl;
uassert(13543, str::stream() << "recovery error file has length zero " << fn, f->length());
assert( ofs < f->length() );
#endif
}
return ((char*) p) + ofs;
return file;
}
RecoveryJob::~RecoveryJob() {
@ -224,9 +231,11 @@ namespace mongo {
}
void RecoveryJob::_close() {
MongoFile::flushAll(true);
for(FileMap::iterator it(_files.begin()), end(_files.end()); it!=end; ++it){
it->second.fsync();
}
_files.clear(); // closes files
_fileToPtr.clear();
}
void RecoveryJob::applyEntry(const ParsedJournalEntry& entry, bool apply, bool dump) {
@ -243,8 +252,9 @@ namespace mongo {
log() << ss.str() << endl;
}
if( apply ) {
void *p = ptr(entry.dbName, entry.e->getFileNo(), entry.e->ofs);
memcpy(p, entry.e->srcData(), entry.e->len);
//TODO(mathias) look into writev() on linux
File& file = getFile(entry.dbName, entry.e->getFileNo());
file.write(entry.e->ofs, entry.e->srcData(), entry.e->len);
}
}
else if(entry.op) {

14
db/dur_recover.h
View File

@ -3,6 +3,7 @@
#pragma once
#include "../util/concurrency/mutex.h"
#include "../util/file.h"
namespace mongo {
class MemoryMappedFile;
@ -28,22 +29,21 @@ namespace mongo {
bool processFile(path journalfile);
void _close(); // doesn't lock
/** retrieve the mmap pointer for the specified dbName plus file number.
/** retrieve the File for the specified dbName plus file number.
open if not yet open.
@param fileNo a value of -1 indicates ".ns"
@param ofs offset to add to the pointer before returning
*/
void* ptr(const char *dbName, int fileNo, unsigned ofs);
// fileno,dbname -> map
map< pair<int,string>, void* > _fileToPtr;
File& getFile(const char *dbName, int fileNo);
// fileno,dbname -> File
// all close at end (destruction) of RecoveryJob
list< shared_ptr<MemoryMappedFile> > _files;
typedef map< pair<int,string>, File > FileMap;
FileMap _files;
unsigned long long _lastDataSyncedFromLastRun;
mongo::mutex _mx; // protects _files and _fileToPtr
mongo::mutex _mx; // protects _files
static RecoveryJob _instance;
};