MohammedDeveloper
diff --git a/‎arangod/Agency/Agent.cpp
Lines changed: 10 additions & 22 deletions b/‎arangod/Agency/Agent.cpp
Lines changed: 10 additions & 22 deletions
diff --git a/‎arangod/Agency/State.cpp
Lines changed: 18 additions & 16 deletions b/‎arangod/Agency/State.cpp
Lines changed: 18 additions & 16 deletions
diff --git a/‎arangod/Agency/State.h
Lines changed: 1 addition & 1 deletion b/‎arangod/Agency/State.h
Lines changed: 1 addition & 1 deletion
@@ -397,30 +397,18 @@ bool Agent::recvAppendEntriesRPC(
 
     _liLock.assertNotLockedByCurrentThread();
     MUTEX_LOCKER(ioLocker, _ioLock);
-  
-    size_t ndups = _state.removeConflicts(queries, gotSnapshot);
-    
-    if (nqs > ndups) {
-      LOG_TOPIC(DEBUG, Logger::AGENCY)
-        << "Appending " << nqs - ndups << " entries to state machine. ("
-        << nqs << ", " << ndups << "): " << payload.toJson() ;
-      
-      try {
 
-        MUTEX_LOCKER(ioLocker, _liLock);
-        _lastApplied = _state.log(queries, ndups);
-        if (_lastApplied < payload[nqs-1].get("index").getNumber<index_t>()) {
-          // We could not log all the entries in this query, we need to report
-          // this to the leader!
-          ok = false;
-        }
-        
-      } catch (std::exception const& e) {
-        LOG_TOPIC(DEBUG, Logger::AGENCY)
-          << "Exception during log append: " << __FILE__ << __LINE__
-          << " " << e.what();
+    try {
+      _lastApplied = _state.log(queries, gotSnapshot);
+      if (_lastApplied < payload[nqs-1].get("index").getNumber<index_t>()) {
+        // We could not log all the entries in this query, we need to report
+        // this to the leader!
+        ok = false;
       }
-      
+    } catch (std::exception const& e) {
+      LOG_TOPIC(DEBUG, Logger::AGENCY)
+        << "Exception during log append: " << __FILE__ << __LINE__
+        << " " << e.what();
     }
   }
 
 
@@ -232,29 +232,32 @@ index_t State::logNonBlocking(
 }
 
 /// Log transactions (follower)
-index_t State::log(query_t const& transactions, size_t ndups) {
-  VPackSlice slices = transactions->slice();
-
-  TRI_ASSERT(slices.isArray());
+index_t State::log(query_t const& transactions, bool gotSnapshot) {
 
+  VPackSlice slices = transactions->slice();
   size_t nqs = slices.length();
 
-  TRI_ASSERT(nqs > ndups);
-  std::string clientId;
+  MUTEX_LOCKER(logLock, _logLock);
 
-  MUTEX_LOCKER(mutexLocker, _logLock);  // log entries must stay in order
+  size_t ndups = removeConflicts(transactions, gotSnapshot);
 
-  for (size_t i = ndups; i < nqs; ++i) {
-    VPackSlice const& slice = slices[i];
+  if (nqs > ndups) {
+    VPackSlice slices = transactions->slice();
+    TRI_ASSERT(slices.isArray());
+    size_t nqs = slices.length();
+    std::string clientId;
 
-    // first to disk
-    if (logNonBlocking(
-          slice.get("index").getUInt(), slice.get("query"),
-          slice.get("term").getUInt(), slice.get("clientId").copyString())==0) {
-      break;
+    for (size_t i = ndups; i < nqs; ++i) {
+
+      VPackSlice const& slice = slices[i];
+      // first to disk
+      if (logNonBlocking(
+            slice.get("index").getUInt(), slice.get("query"),
+            slice.get("term").getUInt(), slice.get("clientId").copyString())==0) {
+        break;
+      }
     }
   }
-
   return _log.empty() ? 0 : _log.back().index;
 }
 
@@ -274,7 +277,6 @@ size_t State::removeConflicts(query_t const& transactions,  bool gotSnapshot) {
 
   LOG_TOPIC(TRACE, Logger::AGENCY) << "removeConflicts " << slices.toJson();
   try {
-    MUTEX_LOCKER(logLock, _logLock);
 
     index_t lastIndex = (!_log.empty()) ? _log.back().index : 0; 
 
 
@@ -71,7 +71,7 @@ class State {
               std::string const& clientId = std::string());
 
   /// @brief Log entries (followers)
-  arangodb::consensus::index_t log(query_t const& queries, size_t ndups = 0);
+  arangodb::consensus::index_t log(query_t const&, bool);
 
   /// @brief Find entry at index with term
   bool find(index_t index, term_t term);