diff options
| author | Greg Studer <greg@10gen.com> | 2013-10-15 14:23:01 -0400 |
|---|---|---|
| committer | Greg Studer <greg@10gen.com> | 2013-10-15 14:45:48 -0400 |
| commit | 2e972e1e7de2966dd5e39ebd79f9fad8dcf5a78c (patch) | |
| tree | af553ab4d0f5ae63f57833804a2d656a6809295f | |
| parent | 487d9e61dba245cfb58af084b802ee4fc41e6288 (diff) | |
| download | mongo-2e972e1e7de2966dd5e39ebd79f9fad8dcf5a78c.tar.gz | |
SERVER-11177 buildbot stale_clustered.js make repl error codes constants
| -rw-r--r-- | src/mongo/client/dbclient_rs.cpp | 9 | ||||
| -rw-r--r-- | src/mongo/db/repl/repl_reads_ok.cpp | 12 | ||||
| -rw-r--r-- | src/mongo/util/assert_util.h | 5 |
3 files changed, 16 insertions, 10 deletions
diff --git a/src/mongo/client/dbclient_rs.cpp b/src/mongo/client/dbclient_rs.cpp index 69419586fae..7e3f9bd794f 100644 --- a/src/mongo/client/dbclient_rs.cpp +++ b/src/mongo/client/dbclient_rs.cpp @@ -1755,7 +1755,8 @@ namespace mongo { // If the error code here ever changes, we need to change this code also BSONElement code = error["code"]; - if( code.isNumber() && code.Int() == 13436 /* not master or secondary */ ){ + if( code.isNumber() && + code.Int() == NotMasterOrSecondaryCode /* not master or secondary */ ) { isntSecondary(); throw DBException( str::stream() << "slave " << _lastSlaveOkHost.toString() << " is no longer secondary", 14812 ); @@ -1951,7 +1952,8 @@ namespace mongo { // Check the error code for a slave not secondary error if( nReturned == -1 || - ( hasErrField( dataObj ) && ! dataObj["code"].eoo() && dataObj["code"].Int() == 13436 ) ){ + ( hasErrField( dataObj ) && ! dataObj["code"].eoo() + && dataObj["code"].Int() == NotMasterOrSecondaryCode ) ){ bool wasMaster = false; if( _lazyState._lastClient == _lastSlaveOkConn.get() ){ @@ -1980,7 +1982,8 @@ namespace mongo { // slaveOk is not set, just mark the master as bad if( nReturned == -1 || - ( hasErrField( dataObj ) && ! dataObj["code"].eoo() && dataObj["code"].Int() == 13435 ) ) + ( hasErrField( dataObj ) && ! dataObj["code"].eoo() + && dataObj["code"].Int() == NotMasterNoSlaveOkCode ) ) { if( _lazyState._lastClient == _master.get() ){ isntMaster(); diff --git a/src/mongo/db/repl/repl_reads_ok.cpp b/src/mongo/db/repl/repl_reads_ok.cpp index 6ebf35aa660..18584c9dce7 100644 --- a/src/mongo/db/repl/repl_reads_ok.cpp +++ b/src/mongo/db/repl/repl_reads_ok.cpp @@ -46,15 +46,15 @@ namespace mongo { if( isMaster() ) return; if ( cc().isGod() ) return; - uassert(13435, "not master and slaveOk=false", + uassert(NotMasterNoSlaveOkCode, "not master and slaveOk=false", !pq || pq->hasOption(QueryOption_SlaveOk) || pq->hasReadPref()); - uassert(13436, + uassert(NotMasterOrSecondaryCode, "not master or secondary; cannot currently read from this replSet member", theReplSet && theReplSet->isSecondary() ); } else { // master/slave - uassert( 10107, + uassert( NotMaster, "not master", isMaster() || (!pq || pq->hasOption(QueryOption_SlaveOk)) || @@ -70,15 +70,15 @@ namespace mongo { if( isMaster() ) return; if ( cc().isGod() ) return; - uassert(17069, "not master and slaveOk=false", + uassert(NotMasterNoSlaveOkCode, "not master and slaveOk=false", !pq || pq->hasOption(QueryOption_SlaveOk) || pq->hasReadPref()); - uassert(17070, + uassert(NotMasterOrSecondaryCode, "not master or secondary; cannot currently read from this replSet member", theReplSet && theReplSet->isSecondary() ); } else { // master/slave - uassert(17071, + uassert(NotMaster, "not master", isMaster() || (!pq || pq->hasOption(QueryOption_SlaveOk)) || diff --git a/src/mongo/util/assert_util.h b/src/mongo/util/assert_util.h index 5aa6c3f7291..648bd81af24 100644 --- a/src/mongo/util/assert_util.h +++ b/src/mongo/util/assert_util.h @@ -32,7 +32,10 @@ namespace mongo { DatabaseDifferCaseCode = 13297 , // uassert( 13297 ) SendStaleConfigCode = 13388 , // uassert( 13388 ) RecvStaleConfigCode = 9996, // uassert( 9996 ) - PrepareConfigsFailedCode = 13104 // uassert( 13104 ) + PrepareConfigsFailedCode = 13104, // uassert( 13104 ) + NotMasterOrSecondaryCode = 13436, // uassert( 13436 ) + NotMasterNoSlaveOkCode = 13435, // uassert( 13435 ) + NotMaster = 10107 // uassert( 10107 ) }; class AssertionCount { |