raft 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb71b1c5a8ec7d92e83aa96fbf5dcd50e1e1618
-  data.tar.gz: 6a68f46a38f513a37f719f449f1c6465942a355d
+  metadata.gz: be1fe056a60bdef6345f99106b94f56c6198c72b
+  data.tar.gz: 98422a40d2f4636076e88f6db833a0b2b66ad908
 SHA512:
-  metadata.gz: 962aa0264a180e89e09d4473d5dd8cee8c9d3e8e7ad99a36d784381abe757fa4f6b484aa265516c3a67e3b112b003448b1bb6a8954de6f3456925107d2916eba
-  data.tar.gz: b2d783f93630ca150a6b8cebb77c21a5251775d28862665e768f780ed3bd92cedb5593332f2c46c9ac6be7d1a9ae35bba4b69b722333cca6904c3c207720569a
+  metadata.gz: c8a2ce6ed2719bfc5cddef9fee47d098c9c68c045c5ebc98904cb31e942276cb9b69f9ded5faf55cd64ae9ffc0ef3f455aded2ce56097ba8fa1fdd687467ee07
+  data.tar.gz: 0ae4654f3392bafd48510b6605c72334c1a36f72bbf1bdd052694f4aeef3bddc5bc473535a67d7e093c614b357ee6569b9250a9b3c14dd093ba0363ca411efc3

data/lib/raft.rb

@@ -6,8 +6,8 @@ module Raft
   class Cluster
     attr_reader :node_ids
 
-    def initialize
-      @node_ids = []
+    def initialize(*node_ids)
+      @node_ids = node_ids
     end
 
     def quorum
@@ -234,8 +234,8 @@ module Raft
         votes_against = 0
         quorum = @cluster.quorum
         #STDOUT.write("\n\t\t#{@id} requests votes for term #{@persistent_state.current_term}\n\n")
-        @config.rpc_provider.request_votes(request, @cluster) do |_, request, response|
-          #STDOUT.write("\n\t\t#{@id} receives vote #{response.vote_granted}\n\n")
+        @config.rpc_provider.request_votes(request, @cluster) do |voter_id, request, response|
+          #STDOUT.write("\n\t\t#{@id} receives vote #{response.vote_granted} from #{voter_id}\n\n")
           elected = nil # no majority result yet
           if request.term != @persistent_state.current_term
             # this is a response to an out-of-date request, just ignore it
@@ -371,7 +371,7 @@ module Raft
     protected :append_entries_to_follower
 
     def handle_request_vote(request)
-      #STDOUT.write("\nnode #{@id} handling vote request from #{request.candidate_id}\n")
+      #STDOUT.write("\nnode #{@id} handling vote request from #{request.candidate_id} (request.last_log_index: #{request.last_log_index}, vs #{@persistent_state.log.last.index}\n")
       response = RequestVoteResponse.new
       response.term = @persistent_state.current_term
       response.vote_granted = false
@@ -391,9 +391,9 @@ module Raft
             @persistent_state.voted_for = request.candidate_id
             response.vote_granted = true
           elsif request.last_log_term == @persistent_state.log.last.term &&
-              request.last_log_index && request.last_log_index < @persistent_state.log.last.index
+              (request.last_log_index || -1) < @persistent_state.log.last.index
             # candidate's log is incomplete compared to this node
-          elsif request.last_log_term && request.last_log_term < @persistent_state.log.last.term
+          elsif (request.last_log_term || -1) < @persistent_state.log.last.term
             # candidate's log is incomplete compared to this node
           else
             @persistent_state.voted_for = request.candidate_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raft
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Harry Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -80,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: A simple Raft distributed consensus implementation
 email: hwilkinson@mdsol.com
 executables: []