SERVER-17018: Only invalidate cursors pointing to the same index

3 files changed, 10 insertions, 6 deletions

diff --git a/src/mongo/db/index/btree_index_cursor.cpp b/src/mongo/db/index/btree_index_cursor.cpp
index be1472241f3..528a0a5ff4d 100644
--- a/src/mongo/db/index/btree_index_cursor.cpp
+++ b/src/mongo/db/index/btree_index_cursor.cpp
@@ -63,13 +63,14 @@ namespace mongo {
 
     bool BtreeIndexCursor::isEOF() const { return _bucket.isNull(); }
 
-    void BtreeIndexCursor::aboutToDeleteBucket(const DiskLoc& bucket) {
+    void BtreeIndexCursor::aboutToDeleteBucket(const IndexCatalogEntry* index,
+                                               const DiskLoc& bucket) {
         SimpleMutex::scoped_lock lock(_activeCursorsMutex);
         for (unordered_set<BtreeIndexCursor*>::iterator i = _activeCursors.begin();
              i != _activeCursors.end(); ++i) {
 
             BtreeIndexCursor* ic = *i;
-            if (bucket == ic->_bucket) {
+            if (bucket == ic->_bucket && ic->_btreeState == index) {
                 ic->_keyOffset = -1;
             }
         }
diff --git a/src/mongo/db/index/btree_index_cursor.h b/src/mongo/db/index/btree_index_cursor.h
index 73a7923095e..8562660738e 100644
--- a/src/mongo/db/index/btree_index_cursor.h
+++ b/src/mongo/db/index/btree_index_cursor.h
@@ -46,9 +46,12 @@ namespace mongo {
         bool isEOF() const;
 
         /**
-         * Called from btree.cpp when we're about to delete a Btree bucket.
+         * Called from btree.cpp when we're about to delete a Btree bucket. The index descriptor
+         * is needed as just the DiskLoc of the bucket is not unique across databases, which might
+         * result in incorrect invalidation of cursors in other unlocked databases.
          */
-        static void aboutToDeleteBucket(const DiskLoc& bucket);
+        static void aboutToDeleteBucket(const IndexCatalogEntry* index,
+                                        const DiskLoc& bucket);
 
         virtual Status setOptions(const CursorOptions& options);
 
diff --git a/src/mongo/db/structure/btree/btree.cpp b/src/mongo/db/structure/btree/btree.cpp
index 2eef1bd55e4..3e2286fe418 100644
--- a/src/mongo/db/structure/btree/btree.cpp
+++ b/src/mongo/db/structure/btree/btree.cpp
@@ -859,7 +859,7 @@ namespace mongo {
 
     template< class V >
     void BtreeBucket<V>::delBucket(IndexCatalogEntry* btreeState, const DiskLoc thisLoc ) {
-        BtreeIndexCursor::aboutToDeleteBucket(thisLoc);
+        BtreeIndexCursor::aboutToDeleteBucket(btreeState, thisLoc);
         verify( !isHead() );
 
         DiskLoc ll = this->parent;
@@ -1000,7 +1000,7 @@ namespace mongo {
             ll.btree<V>()->childForPos( indexInParent( thisLoc ) ).writing() = this->nextChild;
         }
         BTREE(this->nextChild)->parent.writing() = this->parent;
-        BtreeIndexCursor::aboutToDeleteBucket(thisLoc);
+        BtreeIndexCursor::aboutToDeleteBucket(btreeState, thisLoc);
         deallocBucket( btreeState, thisLoc );
     }