SERVER-8442 don't release() direct m/r cursors to shards

nelhage · Feb 11, 2013 · 4257f88 · 4257f88
1 parent 974900c
commit 4257f88
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp
@@ -1564,12 +1564,21 @@ namespace mongo {
     }
 
     ParallelSortClusteredCursor::~ParallelSortClusteredCursor() {
-        // Clear out our metadata before removing legacy cursor data
-        _cursorMap.clear();
-        for( int i = 0; i < _numServers; i++ ) _cursors[i].release();
+
+        // WARNING: Commands (in particular M/R) connect via _oldInit() directly to shards
+        bool isDirectShardCursor = _cursorMap.empty();
+
+        // Non-direct shard cursors are owned by the _cursorMap, so we release
+        // them in the array here.  Direct shard cursors clean themselves.
+        if (!isDirectShardCursor) {
+            for( int i = 0; i < _numServers; i++ ) _cursors[i].release();
+        }
 
         delete [] _cursors;
         _cursors = 0;
+
+        // Clear out our metadata after removing legacy cursor data
+        _cursorMap.clear();
     }
 
     bool ParallelSortClusteredCursor::more() {