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

handle zero file length in recovery dur

Browse Source
This commit is contained in:
dwight 2011-07-22 13:36:24 -04:00
parent 643c49042f
commit c98880c44a
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/dur_recover.cpp
View File

@ -364,6 +364,17 @@ namespace mongo {
/** apply a specific journal file */
bool RecoveryJob::processFile(path journalfile) {
log() << "recover " << journalfile.string() << endl;
try {
if( boost::filesystem::file_size( journalfile.string() ) == 0 ) {
log() << "recover info " << journalfile.string() << " has zero length" << endl;
return true;
}
} catch(...) {
// if something weird like a permissions problem keep going so the massert down below can happen (presumably)
log() << "recover exception checking filesize" << endl;
}
MemoryMappedFile f;
void *p = f.mapWithOptions(journalfile.string().c_str(), MongoFile::READONLY | MongoFile::SEQUENTIAL);
massert(13544, str::stream() << "recover error couldn't open " << journalfile.string(), p);

54
jstests/repl/repl3.js
View File

@ -10,38 +10,42 @@ soonCount = function( count ) {
} );
}
doTest = function( signal ) {
doTest = function (signal) {
rt = new ReplTest( "repl3tests" );
m = rt.start( true );
s = rt.start( false );
am = m.getDB( baseName ).a
am.save( { _id: new ObjectId() } );
soonCount( 1 );
rt.stop( false, signal );
big = new Array( 2000 ).toString();
for( i = 0; i < 1000; ++i )
am.save( { _id: new ObjectId(), i: i, b: big } );
print("repl3.js doTest(" + signal + ")")
rt = new ReplTest("repl3tests");
m = rt.start(true);
s = rt.start(false);
am = m.getDB(baseName).a
am.save({ _id: new ObjectId() });
soonCount(1);
rt.stop(false, signal);
big = new Array(2000).toString();
for (i = 0; i < 1000; ++i)
am.save({ _id: new ObjectId(), i: i, b: big });
s = rt.start(false, { autoresync: null }, true);
s = rt.start( false, { autoresync: null }, true );
// after SyncException, mongod waits 10 secs.
sleep( 15000 );
sleep(15000);
// Need the 2 additional seconds timeout, since commands don't work on an 'allDead' node.
soonCount( 1001 );
as = s.getDB( baseName ).a
assert.eq( 1, as.find( { i: 0 } ).count() );
assert.eq( 1, as.find( { i: 999 } ).count() );
assert.commandFailed( s.getDB( "admin" ).runCommand( { "resync" : 1 } ) );
soonCount(1001);
as = s.getDB(baseName).a
assert.eq(1, as.find({ i: 0 }).count());
assert.eq(1, as.find({ i: 999 }).count());
assert.commandFailed(s.getDB("admin").runCommand({ "resync": 1 }));
rt.stop();
}
doTest( 15 ); // SIGTERM
doTest( 9 ); // SIGKILL
print("repl3.js OK")