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

dur try to elegantly handle ctrl c during recovery

Browse Source
This commit is contained in:
dwight 2010-12-21 02:23:31 -05:00
parent cace711d09
commit cd8b0b6c35
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
db/dur_recover.cpp
View File

@ -30,6 +30,7 @@
#include "db.h"
#include "../util/unittest.h"
#include "cmdline.h"
#include "curop.h"
using namespace mongoutils;
@ -334,6 +335,9 @@ namespace mongo {
JSectHeader h;
br.peek(h);
processSection(br.skip(h.len), h.len);
// ctrl c check
killCurrentOp.checkForInterrupt(false);
}
}
catch( BufReader::eof& ) {
@ -383,10 +387,7 @@ namespace mongo {
okToCleanUp = true;
}
/** recover from a crash
throws on error
*/
void recover() {
void _recover() {
assert( cmdLine.dur );
filesystem::path p = getJournalDir();
@ -407,7 +408,17 @@ namespace mongo {
RecoveryJob j;
j.go(journalFiles);
}
}
/** recover from a crash
throws on error
*/
void recover() {
// we use a lock so that exitCleanly will wait for us
// to finish (or at least to notice what is up and stop)
readlock lk;
_recover(); // throws on interruption
}
struct BufReaderY { int a,b; };
class BufReaderUnitTest : public UnitTest {