diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-12-15 10:02:19 +0100 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-12-15 10:02:46 +0100 |
| commit | 0b48f8ada2acb0de830b23f8cefc8e3fea28d915 (patch) | |
| tree | f7c2811269b6b53199412be2dd5ec02eea15d55d /client/parallel.cpp | |
| parent | 85f1cd56145b90a32b7ccdc750000deeed54fe22 (diff) | |
| parent | f0d9a01bccdaeb466c12c92057914bbfef59526c (diff) | |
| download | mongodb-0b48f8ada2acb0de830b23f8cefc8e3fea28d915.tar.gz | |
Merge branch 'upstream/2.0.2'
Diffstat (limited to 'client/parallel.cpp')
| -rw-r--r-- | client/parallel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/parallel.cpp b/client/parallel.cpp index 76b0168..3a33eb5 100644 --- a/client/parallel.cpp +++ b/client/parallel.cpp @@ -67,7 +67,7 @@ namespace mongo { assert( cursor ); if ( cursor->hasResultFlag( ResultFlag_ShardConfigStale ) ) { - throw StaleConfigException( _ns , "ClusteredCursor::query" ); + throw StaleConfigException( _ns , "ClusteredCursor::_checkCursor" ); } if ( cursor->hasResultFlag( ResultFlag_ErrSet ) ) { @@ -90,7 +90,7 @@ namespace mongo { if ( conn.setVersion() ) { conn.done(); - throw StaleConfigException( _ns , "ClusteredCursor::query ShardConnection had to change" , true ); + throw StaleConfigException( _ns , "ClusteredCursor::query" , true ); } LOG(5) << "ClusteredCursor::query (" << type() << ") server:" << server @@ -490,7 +490,7 @@ namespace mongo { if ( conns[i]->setVersion() ) { conns[i]->done(); - staleConfigExs.push_back( StaleConfigException( _ns , "ClusteredCursor::query ShardConnection had to change" , true ).what() + errLoc ); + staleConfigExs.push_back( (string)"stale config detected for " + StaleConfigException( _ns , "ParallelCursor::_init" , true ).what() + errLoc ); break; } @@ -592,7 +592,7 @@ namespace mongo { // when we throw our exception allConfigStale = true; - staleConfigExs.push_back( e.what() + errLoc ); + staleConfigExs.push_back( (string)"stale config detected for " + e.what() + errLoc ); _cursors[i].reset( NULL ); conns[i]->done(); continue; |