summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiyuan Zhou <siyuan.zhou@mongodb.com>2014-05-01 18:25:05 -0400
committerDan Pasette <dan@mongodb.com>2014-05-16 14:12:45 -0400
commitef0072b437a26083d9c930cccab44042f716b8a5 (patch)
treedc5e97ffa09a0c988fa44b9a2bbb40f5b3da56b4
parentf076d57d427e7fde945303aaec32ba594de5872c (diff)
downloadmongo-ef0072b437a26083d9c930cccab44042f716b8a5.tar.gz
SERVER-13812 Catch exception thrown by getShardsForQuery for geo query
(cherry picked from commit 16169267c6ece79e25f2722a50a3f915728fdb09)
-rw-r--r--src/mongo/s/chunk_manager_targeter.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mongo/s/chunk_manager_targeter.cpp b/src/mongo/s/chunk_manager_targeter.cpp
index ebd7a4eee68..19295a3b6bf 100644
--- a/src/mongo/s/chunk_manager_targeter.cpp
+++ b/src/mongo/s/chunk_manager_targeter.cpp
@@ -291,7 +291,11 @@ namespace mongo {
set<Shard> shards;
if ( _manager ) {
- _manager->getShardsForQuery( shards, query );
+ try {
+ _manager->getShardsForQuery( shards, query );
+ } catch ( const DBException& ex ) {
+ return ex.toStatus();
+ }
}
else {
shards.insert( *_primary );