diff options
| author | Dwight <dwight@10gen.com> | 2010-11-29 16:26:18 -0500 |
|---|---|---|
| committer | Dwight <dwight@10gen.com> | 2010-11-29 16:26:18 -0500 |
| commit | a4eef074ec92dbd46617e287d737779658646ce4 (patch) | |
| tree | 3293c4d166e7e6756272db6265167149d79c508e /db/repl.cpp | |
| parent | 6307bbfb26c01033b6ac688683324e69709f9664 (diff) | |
| download | mongo-a4eef074ec92dbd46617e287d737779658646ce4.tar.gz | |
fix repl10.js
Diffstat (limited to 'db/repl.cpp')
| -rw-r--r-- | db/repl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/db/repl.cpp b/db/repl.cpp index 6646b12c23a..e3d2e80b900 100644 --- a/db/repl.cpp +++ b/db/repl.cpp @@ -1374,8 +1374,8 @@ namespace mongo { BSONElement ts = op.getField("ts"); if( !( ts.type() == Date || ts.type() == Timestamp ) ) { - log() << "sync error: problem querying remote oplog record\n"; - log() << "op: " << op.toString() << '\n'; + log() << "sync error: problem querying remote oplog record" << endl; + log() << "op: " << op.toString() << endl; log() << "halting replication" << endl; replInfo = replAllDead = "sync error: no ts found querying remote oplog record"; throw SyncException(); @@ -1384,8 +1384,8 @@ namespace mongo { nextOpTime = OpTime( ts.date() ); if ( !( last < nextOpTime ) ) { log() << "sync error: last applied optime at slave >= nextOpTime from master" << endl; - log() << " last: " << last.toStringLong() << '\n'; - log() << " nextOpTime: " << nextOpTime.toStringLong() << '\n'; + log() << " last: " << last.toStringLong() << endl; + log() << " nextOpTime: " << nextOpTime.toStringLong() << endl; log() << " halting replication" << endl; replInfo = replAllDead = "sync error last >= nextOpTime"; uassert( 10123 , "replication error last applied optime at slave >= nextOpTime from master", false); @@ -1402,7 +1402,7 @@ namespace mongo { log() << "repl: applied " << n << " operations" << endl; log() << "repl: syncedTo: " << syncedTo.toStringLong() << endl; log() << "waiting until: " << _sleepAdviceTime << " to continue" << endl; - break; + return okResultCode; } sync_pullOpLog_applyOperation(op, &localLogTail, !justOne); |