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

Move opReplicatedEnough call until after checking for errors

Browse Source
This commit is contained in:
Mathias Stearn 2011-01-17 21:31:48 -05:00
parent 7324c1722a
commit 593d6a05b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/dbcommands.cpp
View File

@ -156,9 +156,6 @@ namespace mongo {
while ( 1 ) { while ( 1 ) {
OpTime op(c.getLastOp()); OpTime op(c.getLastOp());
if ( opReplicatedEnough( op, w ) )
break;
// if replication isn't enabled (e.g., config servers) // if replication isn't enabled (e.g., config servers)
if ( ! anyReplEnabled() ) { if ( ! anyReplEnabled() ) {
errmsg = "replication not enabled"; errmsg = "replication not enabled";
@ -171,6 +168,9 @@ namespace mongo {
return true; return true;
} }
if ( opReplicatedEnough( op, w ) )
break;
if ( timeout > 0 && t.millis() >= timeout ) { if ( timeout > 0 && t.millis() >= timeout ) {
result.append( "wtimeout" , true ); result.append( "wtimeout" , true );
errmsg = "timed out waiting for slaves"; errmsg = "timed out waiting for slaves";