SERVER-1551 check cursor ok after yield

Author: astaple

db/query.cpp

@@ -164,6 +164,9 @@ namespace mongo {
                 // TODO should we assert or something?
                 break;
             }
+            if ( !cc->c->ok() ) {
+                break; // if we yielded, could have hit the end
+            }
 
             // this way we can avoid calling updateLocation() every time (expensive)
             // as well as some other nuances handled

db/update.cpp

@@ -931,6 +931,9 @@ namespace mongo {
                         // TODO should we assert or something?
                         break;
                     }
+                    if ( !c->ok() ) {
+                        break;
+                    }
                 }
                 continue;
             }
@@ -1056,6 +1059,9 @@ namespace mongo {
                         cc.release();
                         break;
                     }
+                    if ( !c->ok() ) {
+                        break;
+                    }
                 }
 
                 continue;

jstests/slowNightly/remove9.js

@@ -0,0 +1,12 @@
+t = db.jstests_remove9;
+t.drop();
+
+js = "while( 1 ) { for( i = 0; i < 10000; ++i ) { db.jstests_remove9.save( {i:i} ); } db.jstests_remove9.remove( {i: {$gte:0} } ); }";
+pid = startMongoProgramNoConnect( "mongo" , "--eval" , js , db ? db.getMongo().host : null );
+
+for( var i = 0; i < 10000; ++i ) {
+    t.remove( {i:Random.randInt( 10000 )} );
+    assert.automsg( "!db.getLastError()" );
+}
+
+stopMongoProgramByPid( pid );

mongo.xcodeproj/project.pbxproj

@@ -588,6 +588,7 @@
 		93E8A4D01174EEAF0025F7F8 /* or2.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = or2.js; sourceTree = "<group>"; };
 		93E8A53411752FCE0025F7F8 /* or3.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = or3.js; sourceTree = "<group>"; };
 		93EC34601207628300A95C8A /* capped7.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = capped7.js; sourceTree = "<group>"; };
+		93EC350F1207AEB000A95C8A /* remove9.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = remove9.js; sourceTree = "<group>"; };
 		93F0957010E165E50053380C /* basic.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = basic.js; sourceTree = "<group>"; };
 		93F095CC10E16FF70053380C /* shellfork.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shellfork.js; sourceTree = "<group>"; };
 		C6859E8B029090EE04C91782 /* mongo.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = mongo.1; sourceTree = "<group>"; };
@@ -832,6 +833,7 @@
 		934BEB9A10DFFA9600178102 /* jstests */ = {
 			isa = PBXGroup;
 			children = (
+				93EC350F1207AEB000A95C8A /* remove9.js */,
 				93EC34601207628300A95C8A /* capped7.js */,
 				93E6E10A11FE2BBC00EDA451 /* capped6.js */,
 				93C5BC9E11E5B7FE00F9671C /* group6.js */,