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

cleaning

Browse Source
This commit is contained in:
Dwight 2010-07-21 13:13:36 -04:00
parent 4250625e89
commit 4c28261430
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/oplogreader.h
View File

@ -15,7 +15,7 @@ namespace mongo {
auto_ptr<DBClientCursor> cursor;
public:
void reset() {
void resetCursor() {
cursor.reset();
}
void resetConnection() {
@ -37,7 +37,7 @@ namespace mongo {
void tailCheck() {
if( cursor.get() && cursor->isDead() ) {
log() << "repl: old cursor isDead, will initiate a new one" << endl;
reset();
resetCursor();
}
}

2
db/repl.cpp
View File

@ -1072,7 +1072,7 @@ namespace mongo {
dblock lk;
setLastSavedLocalTs( nextLastSavedLocalTs() );
save();
oplogReader.reset();
oplogReader.resetCursor();
}
}

12
db/repl/rs_rollback.cpp
View File

@ -59,7 +59,15 @@
namespace mongo {
void ReplSetImpl::syncRollback(OplogReader&r) {
}
static void syncRollbackFindCommonPoint(OplogReader& us, OplogReader& them) {
}
void ReplSetImpl::syncRollback(OplogReader&r) {
sethbmsg("syncRollback");
r.resetCursor();
sethbmsg("syncRollbackFindCommonPoint");
}
}

5
db/repl/rs_sync.cpp
View File

@ -78,10 +78,7 @@ namespace mongo {
return;
}
log() << "replSet rollback not yet implemented!" << rsLog;
log() << "replSet ts: " << lastOpTimeWritten.toStringPretty() << ' ' << ts.toStringPretty() << rsLog;
log() << "replSet h: " << lastH << ' ' << h << rsLog;
sleepsecs(60);
syncRollback(r);
return;
}
}