fixed last applied check

pgte · Oct 29, 2014 · dfb0eba · dfb0eba
1 parent 7a5afc8
commit dfb0eba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/lib/leader.js b/lib/leader.js
@@ -112,10 +112,10 @@ L.replicate = function replicate(logIndex, options, cb) {
   function onReplicationSuccess(peerId, peerLogIndex, lastApplied) {
     if (!done[peerId] && peerLogIndex >= logIndex) {
       done[peerId] = true;
-      lastApplieds[peerId] = lastApplied;
       yep ++;
-      maybeStop();
     }
+    lastApplieds[peerId] = lastApplied;
+    maybeStop();
   }
 
   function maybeStop() {

diff --git a/lib/node.js b/lib/node.js
@@ -484,11 +484,7 @@ N.command = function command(cmd, options, cb, isTopologyChange) {
     options = undefined;
   }
 
-  if (!options) {
-    options = {
-      timeout: this.options.commandTimeout
-    };
-  }
+  options = extend({}, {timeout: this.options.commandTimeout}, options);
 
   async.series([
     ensureLoaded,
@@ -535,8 +531,7 @@ N.command = function command(cmd, options, cb, isTopologyChange) {
   }
 
   function replicateAgain(cb) {
-    commitIndex = self.commonState.persisted.log.length();
-    options.waitForNodeLastApplied = options.commitIndex;
+    options.waitForNodeLastApplied = commitIndex;
     self.state.replicate(commitIndex, options, cb);
   }
 };