SERVER-15541 SERVER-15652 implement timing-based yielding

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp
index 8f39e2624a6..d0194e9d1eb 100644
--- a/src/mongo/db/commands/find_cmd.cpp
+++ b/src/mongo/db/commands/find_cmd.cpp
@@ -103,7 +103,12 @@ namespace mongo {
                 options |= QueryPlannerParams::INCLUDE_SHARD_FILTER;
             }
 
-            execStatus = getExecutor(txn, collection, cq.release(), &rawExec, options);
+            execStatus = getExecutor(txn,
+                                     collection,
+                                     cq.release(),
+                                     PlanExecutor::YIELD_AUTO,
+                                     &rawExec,
+                                     options);
         }
 
         if (!execStatus.isOK()) {
@@ -111,7 +116,6 @@ namespace mongo {
         }
 
         scoped_ptr<PlanExecutor> exec(rawExec);
-        exec->setYieldPolicy(PlanExecutor::YIELD_AUTO);
 
         // Got the execution tree. Explain it.
         return Explain::explainStages(exec.get(), verbosity, out);