raft 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93e1acac92fc590e669fd765e13da401bd03649
-  data.tar.gz: 292865e0af4c1a662a3b07fbfeb7d4905af8e195
+  metadata.gz: 8fb71b1c5a8ec7d92e83aa96fbf5dcd50e1e1618
+  data.tar.gz: 6a68f46a38f513a37f719f449f1c6465942a355d
 SHA512:
-  metadata.gz: eb2440b0e811a0a557ae32da8d3024b80e61c8fb45b870836adb15a5d36e0fd578e54459234f113d220f6442504347ed5b3c0cbdb405879cca4c4d2d3b9ef1b0
-  data.tar.gz: f97c12da642745009b5811e38ec584ed40b66687a44ff10effb58d2182a0078787126c3baefc7ba4b5ea351d3e7fa4ebeda16c03cdb3de98a0e20ba2696395e4
+  metadata.gz: 962aa0264a180e89e09d4473d5dd8cee8c9d3e8e7ad99a36d784381abe757fa4f6b484aa265516c3a67e3b112b003448b1bb6a8954de6f3456925107d2916eba
+  data.tar.gz: b2d783f93630ca150a6b8cebb77c21a5251775d28862665e768f780ed3bd92cedb5593332f2c46c9ac6be7d1a9ae35bba4b69b722333cca6904c3c207720569a

data/lib/raft.rb

@@ -1,7 +1,7 @@
 require 'delegate'
 
 module Raft
-  Config = Struct.new(:rpc_provider, :async_provider, :election_timeout, :update_interval, :heartbeat_interval)
+  Config = Struct.new(:rpc_provider, :async_provider, :election_timeout, :election_splay, :update_interval, :heartbeat_interval)
 
   class Cluster
     attr_reader :node_ids
@@ -21,6 +21,22 @@ module Raft
     def initialize(term, index, command)
       @term, @index, @command = term, index, command
     end
+
+    def ==(other)
+      [:term, :index, :command].all? do |attr|
+        self.send(attr) == other.send(attr)
+      end
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    def hash
+      [:term, :index, :command].reduce(0) do |h, attr|
+        h ^= self.send(attr)
+      end
+    end
   end
 
   class Log < DelegateClass(Array)
@@ -129,13 +145,19 @@ module Raft
   end
 
   class Timer
-    def initialize(interval)
-      @interval = interval
-      @start = Time.now - interval
+    def initialize(interval, splay=0.0)
+      @interval = interval.to_f
+      @splay = splay.to_f
+      @start = Time.now - @interval + (rand * @splay)
+    end
+
+    def splayed_interval
+      (@interval + (rand * @splay))#.tap {|t|STDOUT.write("\nsplayed interval is #{t}\n")}
     end
 
     def reset!
-      @start = Time.now
+      @start = Time.now + splayed_interval
+      #STDOUT.write("\ntimer will elapse at #{timeout.strftime('%H:%M:%S:%L')} (timeout is #{timeout.class})\n")
     end
 
     def timeout
@@ -143,6 +165,7 @@ module Raft
     end
 
     def timed_out?
+      #STDOUT.write("\ntime is #{Time.now.strftime('%M:%S:%L')}\n")
       Time.now > timeout
     end
   end
@@ -167,7 +190,7 @@ module Raft
       @cluster = cluster
       @persistent_state = PersistentState.new
       @temporary_state = TemporaryState.new(nil, nil)
-      @election_timer = Timer.new(config.election_timeout)
+      @election_timer = Timer.new(config.election_timeout, config.election_splay)
       @commit_handler = commit_handler || (block.to_proc if block_given?)
     end
 
@@ -189,6 +212,7 @@ module Raft
 
     def follower_update
       if @election_timer.timed_out?
+        #STDOUT.write("follower node #{@id} election timed out at #{Time.now.strftime('%H:%M:%S:%L')}\n")
         @role = CANDIDATE_ROLE
         candidate_update
       end
@@ -198,6 +222,7 @@ module Raft
 
     def candidate_update
       if @election_timer.timed_out?
+        #STDOUT.write("candidate node #{@id} election timed out at #{Time.now.strftime('%H:%M:%S:%L')}\n")
         @persistent_state.current_term += 1
         @persistent_state.voted_for = @id
         reset_election_timeout
@@ -288,7 +313,7 @@ module Raft
     protected :establish_leadership
 
     def send_heartbeats
-      #STDOUT.write("\nsending heartbeats\n")
+      #STDOUT.write("\nnode #{@id} sending heartbeats at #{Time.now.strftime('%H:%M:%S:%L')}\n")
       last_log_entry = @persistent_state.log.last
       log_index = last_log_entry ? last_log_entry.index : nil
       log_term = last_log_entry ? last_log_entry.term : nil
@@ -346,6 +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")
       response = RequestVoteResponse.new
       response.term = @persistent_state.current_term
       response.vote_granted = false
@@ -381,11 +407,12 @@ module Raft
     end
 
     def handle_append_entries(request)
-      #STDOUT.write("\n\nnode #{@id} handle_append_entries: #{request.entries.pretty_inspect}\n\n") if request.prev_log_index.nil?
+      #STDOUT.write("\n\nnode #{@id} handle_append_entries: #{request.entries.pretty_inspect}\n\n") #if request.prev_log_index.nil?
       response = AppendEntriesResponse.new
       response.term = @persistent_state.current_term
       response.success = false
 
+      #STDOUT.write("\n\nnode #{@id} handle_append_entries for term #{request.term} (current is #{@persistent_state.current_term})\n")# if request.prev_log_index.nil?
       return response if request.term < @persistent_state.current_term
       #STDOUT.write("\n\nnode #{@id} handle_append_entries stage 2\n") if request.prev_log_index.nil?
 

data/lib/raft/goliath.rb

@@ -6,9 +6,9 @@ module Raft
   class Goliath
 
     def self.log(message)
-      STDOUT.write("\n\n")
-      STDOUT.write(message)
-      STDOUT.write("\n\n")
+      #STDOUT.write("\n\n")
+      #STDOUT.write(message)
+      #STDOUT.write("\n\n")
     end
 
     class HttpJsonRpcResponder < ::Goliath::API
@@ -36,6 +36,7 @@ module Raft
       end
 
       def request_vote_response(params)
+        #STDOUT.write("\nnode #{@node.id} received request_vote from #{params['candidate_id']}, term #{params['term']}\n")
         request = Raft::RequestVoteRequest.new(
             params['term'],
             params['candidate_id'],
@@ -46,6 +47,7 @@ module Raft
       end
 
       def append_entries_response(params)
+        #STDOUT.write("\nnode #{@node.id} received append_entries from #{params['leader_id']}, term #{params['term']}\n")
         entries = params['entries'].map {|entry| Raft::LogEntry.new(entry['term'], entry['index'], entry['command'])}
         request = Raft::AppendEntriesRequest.new(
             params['term'],
@@ -56,6 +58,7 @@ module Raft
             params['commit_index'])
         #STDOUT.write("\nnode #{@node.id} received entries: #{request.entries.pretty_inspect}\n")
         response = @node.handle_append_entries(request)
+        #STDOUT.write("\nnode #{@node.id} completed append_entries from #{params['leader_id']}, term #{params['term']} (#{response})\n")
         [200, HEADERS, { 'term' => response.term, 'success' => response.success }]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raft
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Harry Wilkinson
@@ -103,7 +103,8 @@ files:
 - lib/raft.rb
 - lib/raft/goliath.rb
 homepage: http://github.com/harryw/raft
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []