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

SERVER-19025 add fassertStatusOK to errorcodes.py

Browse Source
This commit is contained in:
Eric Milkie 2015-06-18 09:14:23 -04:00
parent e383a423d9
commit 75081de3da
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/errorcodes.py
View File

@ -52,7 +52,7 @@ def parseSourceFiles( callback ):
patterns = [ patterns = [
re.compile( r"[umsg]asser(?:t|ted)(?:NoTrace)? *\( *(\d+)" ) , re.compile( r"[umsg]asser(?:t|ted)(?:NoTrace)? *\( *(\d+)" ) ,
re.compile( r"(?:User|Msg|MsgAssertion)Exception *\( *(\d+)" ), re.compile( r"(?:User|Msg|MsgAssertion)Exception *\( *(\d+)" ),
re.compile( r"fassert(?:Failed)?(?:WithStatus)?(?:NoTrace)? *\( *(\d+)" ), re.compile( r"fassert(?:Failed)?(?:WithStatus)?(?:NoTrace)?(?:StatusOK)? *\( *(\d+)" ),
] ]
bad = [ re.compile( r"^\s*assert *\(" ) ] bad = [ re.compile( r"^\s*assert *\(" ) ]

2
src/mongo/s/catalog/replset/catalog_manager_replica_set.cpp
View File

@ -456,7 +456,7 @@ namespace {
}; };
unique_ptr<LiteParsedQuery> findCmd( unique_ptr<LiteParsedQuery> findCmd(
fassertStatusOK(0, LiteParsedQuery::make(nss.toString(), limit, query))); fassertStatusOK(28688, LiteParsedQuery::make(nss.toString(), limit, query)));
QueryFetcher fetcher(grid.shardRegistry()->getExecutor(), QueryFetcher fetcher(grid.shardRegistry()->getExecutor(),
host, host,

3
src/mongo/s/dbclient_shard_resolver.cpp
View File

@ -86,7 +86,8 @@ namespace mongo {
try { try {
// This can throw when we don't find a master! // This can throw when we don't find a master!
HostAndPort masterHostAndPort = replMonitor->getMasterOrUassert(); HostAndPort masterHostAndPort = replMonitor->getMasterOrUassert();
*resolvedHost = fassertStatusOK(0, ConnectionString::parse(masterHostAndPort.toString())); *resolvedHost = fassertStatusOK(28687,
ConnectionString::parse(masterHostAndPort.toString()));
return Status::OK(); return Status::OK();
} }
catch ( const DBException& ) { catch ( const DBException& ) {