DanaDanger-equity 0.1 → 0.2

data/bin/equity

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-#  equity 0.1 - simple queueing software load balancer
+#  equity 0.2 - simple queueing software load balancer
 #
 #  Usage: equity [-d] <listen-port> [<node-address>:]<node-port> ...
 #
@@ -12,6 +12,7 @@
 
 require 'socket'
 require 'equity/node'
+require 'equity/manager'
 
 # Prints a debug message if debugging is enabled.
 def debug(socket, message)
@@ -25,7 +26,7 @@ end
 $debugging = !!ARGV.delete('-d')
 
 if ARGV.length < 2
-  STDERR.puts 'equity 0.1'
+  STDERR.puts 'equity 0.2'
   STDERR.puts 'Usage: equity [-d] <listen-port> [<node-address>:]<node-port> ...'
   STDERR.print "\n"
   STDERR.puts 'The -d option turns on debug mode. Equity will remain in the foreground and'
@@ -65,12 +66,6 @@ unless $debugging
   STDERR.reopen STDOUT
 end
 
-# Start up server.
-$client_queue = []
-
-$server = TCPServer.new(nil, $listen_port)
-$server.listen(5)
-
 # Set up SIGINT handler to print node counters.
 trap 'SIGINT', Proc.new {
   debug(nil, "\nNode Counters")
@@ -80,7 +75,16 @@ trap 'SIGINT', Proc.new {
   exit
 }
 
-puts "Ready on port #{$listen_port}" if $debugging
+# Start up control server.
+$control_server = Equity::Manager.new($nodes, $listen_port)
+
+# Start up server.
+$client_queue = []
+
+$server = TCPServer.new(nil, $listen_port)
+$server.listen(5)
+
+debug(nil, "Ready on port #{$listen_port}")
 
 # Loop forever.
 while true
@@ -117,6 +121,7 @@ while true
   while !$client_queue.empty?
     client = $client_queue.shift
     found_a_node = false
+    failure_count = 0
     sorted_notes = $nodes.sort {|a,b| a.counter <=> b.counter}
     sorted_notes.each do |node|
       next if node.connected?
@@ -124,15 +129,26 @@ while true
         node.connect(client)
       rescue
         debug(client, "connection to #{node} failed")
+        failure_count += 1
         next
       end
       debug(client, "assigned to #{node}")
       found_a_node = true
       break
     end
-    unless found_a_node
-      $client_queue.unshift(client)
-      break
+    
+    $client_queue.unshift(client) unless found_a_node
+    
+    if failure_count == $nodes.length
+      # All nodes failed. Disconnect all queued clients.
+      debug(nil, 'All nodes failed')
+      $client_queue.each {|client| client.close}
+      $client_queue.replace []
     end
+    
+    break unless found_a_node
   end
+  
+  # Check for control packets.
+  $control_server.process_commands
 end

data/lib/equity/manager.rb

@@ -0,0 +1,45 @@
+module Equity
+  class Manager
+    
+    CMD_NODE_STATUS = "\000"
+    
+    def initialize(nodes, port)
+      @nodes = nodes
+      @socket = UDPSocket.new
+      @socket.bind(nil, port)
+    end
+    
+    def process_commands
+      begin
+        data, address = @socket.recvfrom_nonblock(1024)
+      rescue Errno::EAGAIN
+      end
+      return unless data
+      
+      case data
+      when CMD_NODE_STATUS
+        reply = node_status_message
+      else
+        return
+      end
+      UDPSocket.new.send(reply, 0, address[2], address[1])
+    end
+    
+  private
+    
+    def node_status_message
+      message = [@nodes.length].pack('C')
+      @nodes.each do |node|
+        message += [
+          5 + node.address.length,
+          (node.connected? ? 1 : 0),
+          node.counter,
+          node.port
+        ].pack('nCNn')
+        message += node.address
+      end
+      message
+    end
+    
+  end
+end

data/lib/equity/node.rb

@@ -4,6 +4,8 @@ module Equity
   # Represents a cluster node.
   class Node
     attr_reader :counter
+    attr_reader :address
+    attr_reader :port
   
     def initialize(address, port)
       @client  = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DanaDanger-equity
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - DanaDanger
@@ -23,6 +23,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/equity
+- lib/equity/manager.rb
 - lib/equity/node.rb
 - lib/equity/socket_pairing.rb
 has_rdoc: false