SERVER-14995 Move _killPending from CurOp to OperationContext.

Also, limit the lifetime of OperationContext in MongoD so that it goes out of
scope before sending a reply to the client.  This is necessary so that
operations do not appear in the currentOp command result after the server
sends a response to the client.

1 files changed, 0 insertions, 8 deletions

diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 4c41b5bd365..f896b1524b3 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -165,7 +165,6 @@ namespace mongo {
         _maxTimeTracker.reset();
         _message = "";
         _progressMeter.finished();
-        _killPending.store(0);
         _numYields = 0;
         _expectedLatencyMs = 0;
         _op = 0;
@@ -268,16 +267,9 @@ namespace mongo {
             }
         }
 
-        if( killPending() )
-            builder->append("killPending", true);
-
         builder->append( "numYields" , _numYields );
     }
 
-    void CurOp::kill() {
-        _killPending.store(1);
-    }
-
     void CurOp::setMaxTimeMicros(uint64_t maxTimeMicros) {
         _maxTimeMicros = maxTimeMicros;