Fix an intermediate commit error (arangodb#6909)

graetzer · jsteemann · commit 947baf9688ee · 2018-10-16T13:57:06.000+02:00
diff --git a/arangod/RocksDBEngine/RocksDBIncrementalSync.cpp b/arangod/RocksDBEngine/RocksDBIncrementalSync.cpp
@@ -448,8 +448,10 @@ Result handleSyncKeysRocksDB(DatabaseInitialSyncer& syncer,
         transaction::StandaloneContext::Create(syncer.vocbase()), col->cid(),
         AccessMode::Type::EXCLUSIVE);
 
-    trx.addHint(
-        transaction::Hints::Hint::RECOVERY);  // to turn off waitForSync!
+    trx.addHint(transaction::Hints::Hint::RECOVERY);  // turn off waitForSync!
+    trx.addHint(transaction::Hints::Hint::NO_INDEXING);
+    // turn on intermediate commits as the number of keys to delete can be huge here
+    trx.addHint(transaction::Hints::Hint::INTERMEDIATE_COMMITS);
 
     Result res = trx.begin();
 
@@ -505,6 +507,8 @@ Result handleSyncKeysRocksDB(DatabaseInitialSyncer& syncer,
 
     trx.addHint(transaction::Hints::Hint::RECOVERY);  // turn off waitForSync!
     trx.addHint(transaction::Hints::Hint::NO_INDEXING);
+    // turn on intermediate commits as the number of operations can be huge here
+    trx.addHint(transaction::Hints::Hint::INTERMEDIATE_COMMITS);
 
     Result res = trx.begin();
     
diff --git a/arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp b/arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp
@@ -186,10 +186,8 @@ void RocksDBRestReplicationHandler::handleCommandBarrier() {
   if (type == rest::RequestType::POST) {
     VPackBuilder b;
     b.add(VPackValue(VPackValueType::Object));
-    // always return a non-0 barrier id
-    // it will be ignored by the client anyway for the RocksDB engine
-    std::string const idString = std::to_string(TRI_NewTickServer());
-    b.add("id", VPackValue(idString));
+    // always return a 0 barrier ID so clients will ignore it
+    b.add("id", VPackValue("0"));
     b.close();
     generateResult(rest::ResponseCode::OK, b.slice());
   } else if (type == rest::RequestType::PUT ||
