SERVER-13961 Pass through OperationContext in the JS framework

The JS framework uses DBDirectClient, which requires OperationContext in
order to not conflict with locks, which have already been acquired.

This change also makes dbEval not use pooled scopes and create a new scope
instead.

1 files changed, 13 insertions, 4 deletions

diff --git a/src/mongo/scripting/engine_v8-3.25.cpp b/src/mongo/scripting/engine_v8-3.25.cpp
index 4bf7e34ad54..a2c57034e26 100644
--- a/src/mongo/scripting/engine_v8-3.25.cpp
+++ b/src/mongo/scripting/engine_v8-3.25.cpp
@@ -482,6 +482,10 @@ namespace mongo {
     bool V8Scope::isKillPending() const {
         return _pendingKill || _engine->interrupted();
     }
+    
+    OperationContext* V8Scope::getOpContext() const {
+        return _opCtx;
+    }
 
     /**
      * Display a list of all known ops (for verbose output)
@@ -505,7 +509,8 @@ namespace mongo {
           _cpuProfiler(),
           _interruptLock("ScopeInterruptLock"),
           _inNativeExecution(true),
-          _pendingKill(false) {
+          _pendingKill(false),
+          _opCtx(NULL) {
 
         // create new isolate and enter it via a scope
         _isolate.set(v8::Isolate::New());
@@ -1265,9 +1270,13 @@ namespace mongo {
         v8::V8::LowMemoryNotification();
     }
 
-    void V8Scope::localConnect(const char * dbName) {
+    void V8Scope::localConnectForDbEval(OperationContext* txn, const char * dbName) {
         {
-            V8_SIMPLE_HEADER
+            V8_SIMPLE_HEADER;
+
+            invariant(_opCtx == NULL);
+            _opCtx = txn;
+
             if (_connectState == EXTERNAL)
                 uasserted(12510, "externalSetup already called, can't call localConnect");
             if (_connectState ==  LOCAL) {
@@ -1295,7 +1304,7 @@ namespace mongo {
             _connectState = LOCAL;
             _localDBName = dbName;
         }
-        loadStored();
+        loadStored(txn);
     }
 
     void V8Scope::externalSetup() {