SERVER-15541 SERVER-15652 implement timing-based yielding

1 files changed, 23 insertions, 14 deletions

diff --git a/jstests/core/queryoptimizer3.js b/jstests/core/queryoptimizer3.js
index a90c7985839..8cace47dc66 100644
--- a/jstests/core/queryoptimizer3.js
+++ b/jstests/core/queryoptimizer3.js
@@ -12,22 +12,31 @@ for( i = 0; i < 100; ++i ) {
     for( j = 0; j < 100; ++j ) {
         t.save({a:j,b:j});
     }
-    m = i % 5;
-    if ( m == 0 ) {
-        t.count({a:{$gte:0},b:{$gte:0}});        
-    }
-    else if ( m == 1 ) {
-        t.find({a:{$gte:0},b:{$gte:0}}).itcount();
-    }
-    else if ( m == 2 ) {
-        t.remove({a:{$gte:0},b:{$gte:0}});
-    }
-    else if ( m == 3 ) {
-        t.update({a:{$gte:0},b:{$gte:0}},{});
+
+    try {
+        m = i % 5;
+        if ( m == 0 ) {
+            t.count({a:{$gte:0},b:{$gte:0}});
+        }
+        else if ( m == 1 ) {
+            t.find({a:{$gte:0},b:{$gte:0}}).itcount();
+        }
+        else if ( m == 2 ) {
+            t.remove({a:{$gte:0},b:{$gte:0}});
+        }
+        else if ( m == 3 ) {
+            t.update({a:{$gte:0},b:{$gte:0}},{});
+        }
+        else if ( m == 4 ) {
+            t.distinct('x',{a:{$gte:0},b:{$gte:0}});
+        }
     }
-    else if ( m == 4 ) {
-        t.distinct('x',{a:{$gte:0},b:{$gte:0}});
+    catch (e) {
+        print("Op killed during yield: " + e.message);
     }
 }
 
 p();
+
+// Ensure that the server is still responding.
+assert.commandWorked(db.runCommand({isMaster: 1}));