adding inBackground flag

arangodb · jsteemann · Dec 21, 2018 · Dec 3, 2018 · Dec 3, 2018 · Dec 4, 2018
commit ef4bb05b3d08ac2f93188fb72d07ac24d5aac577
diff --git a/arangod/RestHandler/RestShutdownHandler.cpp b/arangod/RestHandler/RestShutdownHandler.cpp
@@ -103,12 +103,12 @@ RestStatus RestShutdownHandler::execute() {
   rest::Scheduler* scheduler = SchedulerFeature::SCHEDULER;
   // don't block the response for workers waiting on this callback
   // this should allow workers to go into the IDLE state
-  scheduler->queue(RequestPriority::HIGH, [this] {
+  scheduler->queue(RequestPriority::HIGH, []{
     // Give the server 2 seconds to send the reply:
     std::this_thread::sleep_for(std::chrono::seconds(2));
     // Go down:
     ApplicationServer::server->beginShutdown();
-    });
+  });
 
   return RestStatus::DONE;
 }
diff --git a/arangod/RocksDBEngine/RocksDBCollection.cpp b/arangod/RocksDBEngine/RocksDBCollection.cpp
@@ -417,17 +417,21 @@ std::shared_ptr<Index> RocksDBCollection::createIndex(
 
   // Step 5. cleanup
   if (res.ok()) {
-    { // swap in actual index
+    {
       WRITE_LOCKER(indexGuard, _indexesLock);
-      for (size_t i = 0; i < _indexes.size(); i++) {
-        if (_indexes[i]->id() == buildIdx->id()) {
-          _indexes[i] = idx;
-          break;
+      if (inBackground) { // swap in actual index
+        for (size_t i = 0; i < _indexes.size(); i++) {
+          if (_indexes[i]->id() == buildIdx->id()) {
+            _indexes[i] = idx;
+            break;
+          }
         }
+      } else {
+        _indexes.push_back(idx);
       }
     }
 
-    // we should sync the selectivity estimates
+    // we should sync the selectivity estimates TODO fix
     res = engine->settingsManager()->sync(false);
     if (res.fail()) { // not critical
       LOG_TOPIC(WARN, Logger::ENGINES) << "could not sync settings: "

diff --git a/tests/js/common/shell/shell-index-rocksdb.js b/tests/js/common/shell/shell-index-rocksdb.js
@@ -8,7 +8,7 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright 2010-2012 triagens GmbH, Cologne, Germany
+/// Copyright 2018 ArangoDB GmbH, Cologne, Germany
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.
@@ -22,10 +22,9 @@
 /// See the License for the specific language governing permissions and
 /// limitations under the License.
 ///
-/// Copyright holder is triAGENS GmbH, Cologne, Germany
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
 ///
-/// @author Dr. Frank Celler, Lucas Dohmen
-/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+/// @author 2018 Simon Grätzer, Dan Larkin-York
 ////////////////////////////////////////////////////////////////////////////////
 
 const jsunity = require("jsunity");
@@ -104,7 +103,7 @@ function backgroundIndexSuite() {
       }
 
       // create the index on the main thread
-      c.ensureIndex({type: 'hash', fields: ['value'], unique: false});
+      c.ensureIndex({type: 'hash', fields: ['value'], unique: false, inBackground: true});
 
       // wait for insertion tasks to complete
       waitForTasks();
@@ -168,7 +167,7 @@ function backgroundIndexSuite() {
       }
 
       // create the index on the main thread
-      c.ensureIndex({type: 'hash', fields: ['value'], unique: true});
+      c.ensureIndex({type: 'hash', fields: ['value'], unique: true, inBackground: true });
 
       // wait for insertion tasks to complete
       waitForTasks();
@@ -229,7 +228,7 @@ function backgroundIndexSuite() {
 
       try {
         // create the index on the main thread
-        c.ensureIndex({type: 'hash', fields: ['value'], unique: true});
+        c.ensureIndex({type: 'hash', fields: ['value'], unique: true, inBackground: true});
         fail();
       } catch(err) {
         assertEqual(errors.ERROR_ARANGO_UNIQUE_CONSTRAINT_VIOLATED.code, err.errorNum, err);