dcell 0.9.0 → 0.10.0

data/lib/dcell/registries/redis_adapter.rb

@@ -14,44 +14,13 @@ module DCell
         redis  = Redis.new options
         @redis = Redis::Namespace.new @namespace, :redis => redis
 
-        @node_registry   = NodeRegistry.new(@redis)
         @global_registry = GlobalRegistry.new(@redis)
       end
 
-      def clear_nodes
-        @node_registry.clear
-      end
-
       def clear_globals
         @global_registry.clear
       end
 
-      class NodeRegistry
-        def initialize(redis)
-          @redis = redis
-        end
-
-        def get(node_id)
-          @redis.hget 'nodes', node_id
-        end
-
-        def set(node_id, addr)
-          @redis.hset 'nodes', node_id, addr
-        end
-
-        def nodes
-          @redis.hkeys 'nodes'
-        end
-
-        def clear
-          @redis.del 'nodes'
-        end
-      end
-
-      def get_node(node_id);       @node_registry.get(node_id) end
-      def set_node(node_id, addr); @node_registry.set(node_id, addr) end
-      def nodes;                   @node_registry.nodes end
-
       class GlobalRegistry
         def initialize(redis)
           @redis = redis

data/lib/dcell/registries/zk_adapter.rb

@@ -36,51 +36,13 @@ module DCell
         end
 
         @zk = ZK.new(*servers)
-        @node_registry = NodeRegistry.new(@zk, @base_path)
         @global_registry = GlobalRegistry.new(@zk, @base_path)
       end
 
-      def clear_nodes
-        @node_registry.clear
-      end
-
       def clear_globals
         @global_registry.clear
       end
 
-      class NodeRegistry
-        def initialize(zk, base_path)
-          @zk, @base_path = zk, "#{base_path}/nodes"
-          @zk.mkdir_p @base_path
-        end
-
-        def get(node_id)
-          result, _ = @zk.get("#{@base_path}/#{node_id}")
-          result
-        rescue ZK::Exceptions::NoNode
-        end
-
-        def set(node_id, addr)
-          path = "#{@base_path}/#{node_id}"
-          @zk.set path, addr
-        rescue ZK::Exceptions::NoNode
-          @zk.create path, addr
-        end
-
-        def nodes
-          @zk.children @base_path
-        end
-
-        def clear
-          @zk.rm_rf @base_path
-          @zk.mkdir_p @base_path
-        end
-      end
-
-      def get_node(node_id);       @node_registry.get(node_id) end
-      def set_node(node_id, addr); @node_registry.set(node_id, addr) end
-      def nodes;                   @node_registry.nodes end
-
       class GlobalRegistry
         def initialize(zk, base_path)
           @zk, @base_path = zk, "#{base_path}/globals"
@@ -119,4 +81,4 @@ module DCell
       def global_keys;            @global_registry.global_keys end
     end
   end
-end
+end

data/lib/dcell/router.rb

@@ -3,66 +3,73 @@ require 'weakref'
 module DCell
   # Route incoming messages to their recipient actors
   class Router
-    @lock = Mutex.new
-    @table = {}
+    @mutex     = Mutex.new
+    @addresses = {}
+    @mailboxes = {}
 
     class << self
       # Enter a mailbox into the registry
       def register(mailbox)
-        id = mailbox.object_id.to_s(16)
-
-        @lock.synchronize do
-          ref = @table[id]
-          unless ref && ref.weakref_alive?
-            @table[id] = WeakRef.new(mailbox)
+        @mutex.lock
+        begin
+          address = @addresses[mailbox.object_id]
+          unless address
+            address = Celluloid.uuid
+            @addresses[mailbox.object_id] = address
           end
-        end
 
-        id
+          ref = @mailboxes[address]
+          @mailboxes[address] = WeakRef.new(mailbox) unless ref && ref.weakref_alive?
+
+          address
+        ensure
+          @mutex.unlock rescue nil
+        end
       end
 
-      # Find a mailbox by its ID
-      def find(mailbox_id)
-        @lock.synchronize do
-          ref = @table[mailbox_id]
+      # Find a mailbox by its address
+      def find(mailbox_address)
+        @mutex.lock
+        begin
+          ref = @mailboxes[mailbox_address]
           return unless ref
-          begin
-            ref.__getobj__
-          rescue WeakRef::RefError
-            # The referenced actor is dead, so prune the registry
-            @table.delete mailbox_id
-            nil
-          end
+          ref.__getobj__
+        rescue WeakRef::RefError
+          # The referenced actor is dead, so prune the registry
+          @mailboxes.delete mailbox_address
+          nil
+        ensure
+          @mutex.unlock rescue nil
         end
       end
 
       # Route a message to a given mailbox ID
-      def route(mailbox_id, message)
-        recipient = find mailbox_id
+      def route(recipient, message)
+        recipient = find(recipient) if recipient.is_a? String
 
         if recipient
           recipient << message
         else
-          Celluloid::Logger.debug("received message for invalid actor: #{mailbox_id.inspect}")
+          Celluloid::Logger.debug("received message for invalid actor: #{mailbox_address.inspect}")
         end
       end
 
       # Route a system event to a given mailbox ID
-      def route_system_event(mailbox_id, event)
-        recipient = find mailbox_id
+      def route_system_event(mailbox_address, event)
+        recipient = find mailbox_address
 
         if recipient
           recipient.system_event event
         else
-          Celluloid::Logger.debug("received message for invalid actor: #{mailbox_id.inspect}")
+          Celluloid::Logger.debug("received message for invalid actor: #{mailbox_address.inspect}")
         end
       end
 
       # Prune all entries that point to dead objects
       def gc
-        @lock.synchronize do
-          @table.each do |id, ref|
-            @table.delete id unless ref.weakref_alive?
+        @mutex.synchronize do
+          @mailboxes.each do |id, ref|
+            @mailboxes.delete id unless ref.weakref_alive?
           end
         end
       end

data/lib/dcell/rpc.rb

@@ -1,8 +1,6 @@
 require 'weakref'
 
 module DCell
-  EPOCH = Time.gm(2012) # All things begin in 2012
-
   class RPC < Celluloid::SyncCall
     def initialize(id, caller, method, arguments, block)
       @id, @caller, @method, @arguments, @block = id, caller, method, arguments, block
@@ -17,16 +15,16 @@ module DCell
     # Loader for custom marshal format
     def self._load(string)
       id = string.slice!(0, string.index(":") + 1)
-      match = id.match(/^([0-9a-fA-F]+)@(.+?):$/)
+      match = id.match(/^([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})@(.+?):$/)
       raise ArgumentError, "couldn't parse call ID" unless match
 
-      call_id, node_id = match[1], match[2]
+      uuid, node_id = match[1], match[2]
 
       if DCell.id == node_id
-        Manager.claim Integer("0x#{call_id}")
+        Manager.claim uuid
       else
         caller, method, arguments, block = Marshal.load(string)
-        RPC.new("#{call_id}@#{node_id}", caller, method, arguments, block)
+        RPC.new("#{uuid}@#{node_id}", caller, method, arguments, block)
       end
     end
 
@@ -35,31 +33,33 @@ module DCell
       @mutex  = Mutex.new
       @ids    = {}
       @calls  = {}
-      @serial = Integer(Time.now - EPOCH) * 0x100000
 
       def self.register(call)
         @mutex.lock
-        call_id = @ids[call.object_id]
-        unless call_id
-          call_id = @serial
-          @serial += 1
-          @ids[call.object_id] = call_id
-        end
+        begin
+          call_id = @ids[call.object_id]
+          unless call_id
+            call_id = Celluloid.uuid
+            @ids[call.object_id] = call_id
+          end
 
-        @calls[call_id] = WeakRef.new(call)
-        call_id
-      ensure
-        @mutex.unlock
+          @calls[call_id] = WeakRef.new(call)
+          call_id
+        ensure
+          @mutex.unlock rescue nil
+        end
       end
 
       def self.claim(call_id)
         @mutex.lock
-        ref = @calls.delete(call_id)
-        ref.__getobj__ if ref
-      rescue WeakRef::RefError
-        # Nothing to see here, folks
-      ensure
-        @mutex.unlock
+        begin
+          ref = @calls.delete(call_id)
+          ref.__getobj__ if ref
+        rescue WeakRef::RefError
+          # Nothing to see here, folks
+        ensure
+          @mutex.unlock rescue nil
+        end
       end
     end
   end

data/lib/dcell/server.rb

@@ -5,6 +5,9 @@ module DCell
 
     # Bind to the given 0MQ address (in URL form ala tcp://host:port)
     def initialize
+      # The gossip protocol is dependent on the node manager
+      link Actor[:node_manager]
+
       @addr   = DCell.addr
       @socket = PullSocket.new
 
@@ -20,7 +23,7 @@ module DCell
 
     # Wait for incoming 0MQ messages
     def run
-      while true; handle_message @socket.read; end
+      while true; handle_message! @socket.read; end
     end
 
     # Shut down the server
@@ -39,7 +42,7 @@ module DCell
 
       begin
         message.dispatch
-      rescue Exception => ex
+      rescue => ex
         Celluloid::Logger.crash("DCell::Server: message dispatch failed", ex)
       end
     end

data/lib/dcell/version.rb

@@ -1,3 +1,3 @@
 module DCell
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/spec/dcell/actor_proxy_spec.rb

@@ -26,6 +26,10 @@ describe DCell::ActorProxy do
     @remote_actor.value.should == 42
   end
 
+  it "makes future calls to remote actors" do
+    @remote_actor.future(:value).value.should == 42
+  end
+
   context :linking do
     before :each do
       @local_actor = LocalActor.new

data/spec/dcell/celluloid_ext_spec.rb

@@ -4,6 +4,10 @@ describe Celluloid, "extensions" do
   before do
     class WillKane
       include Celluloid
+
+      def speak
+        "Don't shove me Harv."
+      end
     end
     @marshal = WillKane.new
   end
@@ -18,4 +22,11 @@ describe Celluloid, "extensions" do
     string = Marshal.dump(@marshal.mailbox)
     Marshal.load(string).should be_alive
   end
+
+  it "marshals Celluloid::Future objects" do
+    future = @marshal.future(:speak)
+    future.should be_a(Celluloid::Future)
+    string = Marshal.dump(future)
+    Marshal.load(string).value.should == "Don't shove me Harv."
+  end
 end

data/spec/dcell/directory_spec.rb

@@ -5,4 +5,4 @@ describe DCell::Directory do
     DCell::Directory["foobar"] = "tcp://localhost:1870"
     DCell::Directory["foobar"].should == "tcp://localhost:1870"
   end
-end
+end

data/spec/dcell/explorer_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'dcell/explorer'
+
+describe DCell::Explorer do
+  EXPLORER_HOST = 'localhost'
+  EXPLORER_PORT = 7778
+  EXPLORER_BASE = "http://#{EXPLORER_HOST}:#{EXPLORER_PORT}"
+
+  before do
+    @explorer = DCell::Explorer.new(EXPLORER_HOST, EXPLORER_PORT)
+  end
+
+  it "reports the current node's status" do
+    response = Net::HTTP.get URI(EXPLORER_BASE)
+    response[%r{<h1><.*?> ([\w\.\-]+)<\/h1>}, 1].should == DCell.id
+  end
+end

data/spec/dcell/global_spec.rb

@@ -11,6 +11,10 @@ describe DCell::Global do
 
     # Double check the global value is available on all nodes
     node = DCell::Node['test_node']
+    20.downto(0) do |i|
+      break if node[:test_actor].the_answer
+      sleep 1
+    end
     node[:test_actor].the_answer.should == 42
   end
 

data/spec/dcell/registries/gossip_adapter_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe DCell::Registry::GossipAdapter do
+  subject { DCell::Registry::GossipAdapter.new :env => "test" }
+  it_behaves_like "a DCell registry"
+end

data/spec/spec_helper.rb

@@ -5,12 +5,19 @@ Bundler.setup
 require 'dcell'
 Dir['./spec/support/*.rb'].map { |f| require f }
 
-DCell.setup
-DCell.run!
+RSpec.configure do |config|
+  config.before(:suite) do
+    DCell.setup :directory => { :id => 'test_node', :addr => "tcp://127.0.0.1:#{TestNode::PORT}" }
+    @supervisor = DCell.run!
 
-TestNode.start
-TestNode.wait_until_ready
+    TestNode.start
+    TestNode.wait_until_ready
+  end
 
-at_exit do
-  TestNode.stop
-end
+  config.after(:suite) do
+    TestNode.stop
+  end
+end
+
+# FIXME: this is hax to bypass the other at_exit handlers
+at_exit { exit! $!.status }

data/spec/support/registry_examples.rb

@@ -1,22 +1,4 @@
 shared_context "a DCell registry" do
-  context "node registry" do
-    before :each do
-      subject.clear_nodes
-    end
-
-    it "stores node addresses" do
-      address = "tcp://localhost:7777"
-
-      subject.set_node("foobar", address)
-      subject.get_node("foobar").should == address
-    end
-
-    it "stores the IDs of all nodes" do
-      subject.set_node("foobar", "tcp://localhost:7777")
-      subject.nodes.should include "foobar"
-    end
-  end
-
   context "global registry" do
     before :each do
       subject.clear_globals