SERVER-4844

1 files changed, 5 insertions, 2 deletions

diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
index 4165bfe8586..295b3b2b770 100755
--- a/src/mongo/db/commands/pipeline_command.cpp
+++ b/src/mongo/db/commands/pipeline_command.cpp
@@ -19,6 +19,7 @@
 #include "db/commands/pipeline.h"

 #include "db/commands/pipeline_d.h"

 #include "db/cursor.h"

+#include "db/interrupt_status_mongod.h"

 #include "db/pdfile.h"

 #include "db/pipeline/accumulator.h"

 #include "db/pipeline/document.h"

@@ -72,7 +73,8 @@ namespace mongo {
                               int options, string &errmsg,

                               BSONObjBuilder &result, bool fromRepl) {

 

-        intrusive_ptr<ExpressionContext> pCtx(ExpressionContext::create());

+        intrusive_ptr<ExpressionContext> pCtx(

+            ExpressionContext::create(&InterruptStatusMongod::status));

 

         /* try to parse the command; if this fails, then we didn't run */

         intrusive_ptr<Pipeline> pPipeline(

@@ -123,7 +125,8 @@ namespace mongo {
         }

 

         /* on the shard servers, create the local pipeline */

-        intrusive_ptr<ExpressionContext> pShardCtx(ExpressionContext::create());

+        intrusive_ptr<ExpressionContext> pShardCtx(

+            ExpressionContext::create(&InterruptStatusMongod::status));

         intrusive_ptr<Pipeline> pShardPipeline(

             Pipeline::parseCommand(errmsg, shardBson, pShardCtx));

         if (!pShardPipeline.get()) {