fix V8-context enter/exit pairs (arangodb#4879)

dothebart · jsteemann · commit 5c7006292958 · 2018-03-19T11:03:54.000+01:00
diff --git a/arangod/V8Server/V8DealerFeature.cpp b/arangod/V8Server/V8DealerFeature.cpp
@@ -322,7 +322,7 @@ V8Context* V8DealerFeature::addContext() {
 
     // no other thread can use the context when we are here, as the
     // context has not been added to the global list of contexts yet
-    loadJavaScriptFileInContext(database->systemDatabase(), "server/initialize.js", context, nullptr);
+    loadJavaScriptFileInContextNoLock(database->systemDatabase(), "server/initialize.js", context);
     return context; 
   } catch (...) {
     delete context;
@@ -1342,6 +1342,31 @@ bool V8DealerFeature::loadJavaScriptFileInContext(TRI_vocbase_t* vocbase,
   return true;
 }
 
+bool V8DealerFeature::loadJavaScriptFileInContextNoLock(TRI_vocbase_t* vocbase,
+    std::string const& file, V8Context* context) {
+  TRI_ASSERT(vocbase != nullptr);
+  TRI_ASSERT(context != nullptr);
+
+  if (_stopping) {
+    return false;
+  }
+  
+  if (!vocbase->use()) {
+    return false;
+  }
+
+  prepareLockedContext(vocbase, context, true);
+
+  try {
+    loadJavaScriptFileInternal(file, context, nullptr);
+  } catch (...) {
+    LOG_TOPIC(WARN, Logger::V8) << "caught exception while executing JavaScript file '" << file << "' in context #" << context->id();
+    throw;
+  }
+  
+  return true;
+}
+
 void V8DealerFeature::loadJavaScriptFileInternal(std::string const& file, V8Context* context, VPackBuilder* builder) {
   v8::HandleScope scope(context->_isolate);
   auto localContext =
@@ -1368,6 +1393,8 @@ void V8DealerFeature::loadJavaScriptFileInternal(std::string const& file, V8Cont
     }
   }
   
+  localContext->Exit();
+  
   LOG_TOPIC(TRACE, arangodb::Logger::V8) << "loaded Javascript file '" << file << "' for V8 context #" << context->id();
 }
 
diff --git a/arangod/V8Server/V8DealerFeature.h b/arangod/V8Server/V8DealerFeature.h
@@ -133,6 +133,7 @@ class V8DealerFeature final : public application_features::ApplicationFeature {
   void loadJavaScriptFileInternal(std::string const& file, V8Context* context,
                                   VPackBuilder* builder);
   bool loadJavaScriptFileInContext(TRI_vocbase_t*, std::string const& file, V8Context* context, VPackBuilder* builder);
+  bool loadJavaScriptFileInContextNoLock(TRI_vocbase_t*, std::string const& file, V8Context* context);
   void prepareLockedContext(TRI_vocbase_t*, V8Context*, bool allowUseDatabase);
   void exitContextInternal(V8Context*);
   void cleanupLockedContext(V8Context*);
