SERVER-15675 PlanStage::invalidate() needs OperationContext

PlanStage::invalidate() is always called by a different thread than
the stage's owning thread.  The method should use the active
OperationContext (the caller's) rather than the stage's
OperationContext.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mongo/db/exec/plan_stage.h b/src/mongo/db/exec/plan_stage.h
index a135a4b1414..71432c06efa 100644
--- a/src/mongo/db/exec/plan_stage.h
+++ b/src/mongo/db/exec/plan_stage.h
@@ -201,9 +201,6 @@ namespace mongo {
          * any saved state and be ready to handle calls to work().
          *
          * Can only be called after saveState.
-         *
-         * XXX: We may not need to pass down 'opCtx' if getMore'd queries use the same
-         * OperationContext they were created with.
          */
         virtual void restoreState(OperationContext* opCtx) = 0;
 
@@ -214,7 +211,9 @@ namespace mongo {
          *
          * Can only be called after a saveState but before a restoreState.
          */
-        virtual void invalidate(const DiskLoc& dl, InvalidationType type) = 0;
+        virtual void invalidate(OperationContext* txn,
+                                const DiskLoc& dl,
+                                InvalidationType type) = 0;
 
         /**
          * Retrieve a list of this stage's children. This stage keeps ownership of