archipelago 0.2.7 → 0.3.0

data/lib/archipelago.rb

@@ -15,4 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'rubygems'
+require 'fastthread'
 $: << File.dirname(File.expand_path(__FILE__))

data/lib/archipelago/client.rb

@@ -35,11 +35,13 @@ module Archipelago
     # The timeout that will be used in the first lookup to ensure that we actually
     # have any services.
     #
-    INITIAL_LOOKUP_TIMEOUT = 5
+    INITIAL_LOOKUP_TIMEOUT = 0
 
     class Base
       include Archipelago::Disco::Camel
+
       attr_reader :jockey, :services, :service_descriptions
+      attr_accessor :debug_callable
 
       #
       # Initialize a Client using Archipelago::Disco::MC or <i>:jockey</i> if given, 
@@ -55,6 +57,7 @@ module Archipelago
         @maximum_service_update_interval = options[:maximum_service_update_interval] || MAXIMUM_SERVICE_UPDATE_INTERVAL
         @service_descriptions = options[:service_descriptions]
         @initial_lookup_timeout = options[:initial_lookup_timeout] || INITIAL_LOOKUP_TIMEOUT
+        @debug_callable = options[:debug_callable]
         @services = {}
         @service_descriptions.each do |name, description|
           @services[name] = Archipelago::Disco::ServiceLocker.new
@@ -101,6 +104,8 @@ module Archipelago
       #
       def update_services!(options = {})
         timeout = options[:timeout] || 0
+        silent = options[:silent] || false
+
         validate = options[:validate] || false
         around_update_services do
           @service_descriptions.each do |name, description|
@@ -117,10 +122,11 @@ module Archipelago
             # more than on average once every MAXIMUM_SERVICE_UPDATE_INTERVAL, so that MAY make it worthwhile to do
             # the RBTree song and dance in here. Hopefully.
             #
-            new_services = @jockey.lookup(Archipelago::Disco::Query.new(description), timeout)
+            new_services = @jockey.lookup(Archipelago::Disco::Query.new(description), :timeout => timeout, :silent => silent)
             new_services.convert_to_tree!
             new_services.validate! if validate
             @services[name] = new_services
+            @debug_callable.call("#{self}.service[#{name.inspect}]: #{PP.pp(@services[name].keys, "")}") if @debug_callable
           end
         end
       end
@@ -214,7 +220,7 @@ module Archipelago
       def start_service_updater
         update_services!(:timeout => @initial_lookup_timeout, :validate => true)
         @service_update_thread.kill if defined?(@service_update_thread)
-        @service_update_thread = Thread.start do
+        @service_update_thread = Thread.new do
           standoff = @initial_service_update_interval
           loop do
             begin

data/lib/archipelago/current.rb

@@ -33,41 +33,6 @@ module Archipelago
 
   module Current
 
-    class Queue
-      def initialize
-        @lock = Monitor.new
-        @flag = MonitorMixin::ConditionVariable.new(@lock)
-        @ary = []
-      end
-      def <<(e)
-        @lock.synchronize do
-          @ary << e
-          @flag.broadcast
-        end
-      end
-      def empty?(wait = false)
-        @lock.synchronize do
-          if wait
-            @flag.wait_until do
-              @ary.empty?
-            end unless @ary.empty?
-            return @ary.empty?
-          else
-            return @ary.empty?
-          end
-        end
-      end
-      def shift
-        @lock.synchronize do
-          @flag.wait_while do
-            @ary.empty?
-          end if @ary.empty?
-          @flag.broadcast
-          return @ary.shift
-        end
-      end
-    end
-
     #
     # Adds a few threaded methods to the normal ruby collections.
     #

data/lib/archipelago/disco.rb

@@ -46,7 +46,7 @@ module Archipelago
     #
     # Default lookup timeout.
     #
-    LOOKUP_TIMEOUT = 10
+    LOOKUP_TIMEOUT = 0
     #
     # Default initial pause between resending lookup queries.
     # Will be doubled for each resend.
@@ -80,6 +80,7 @@ module Archipelago
     # can include this for simplicity.
     #
     module Camel
+      attr_reader :jockey
       private
       #
       # Setup our @jockey as a Archipelago::Disco::Jockey with given options.
@@ -311,11 +312,20 @@ module Archipelago
         @attributes = hash
       end
       #
+      # To make it Hash and Set friendly.
+      #
+      def hash
+        @attributes.inject(0) do |sum, pair|
+          sum + pair.first.hash + pair.last.hash
+        end
+      end
+      #
       # Returns whether our @attributes are equal to that of +o+.
       #
       def eql?(o)
         ServiceDescription === o && @attributes == o.attributes
       end
+      alias :== :eql?
       #
       # Returns whether this ServiceDescription matches the given +match+.
       #
@@ -433,7 +443,7 @@ module Archipelago
       #
       def get_services(match)
         rval = ServiceLocker.new
-        self.t_each do |service_id, service_data|
+        self.each do |service_id, service_data|
           if service_data.matches?(match)
             rval[service_id] = service_data 
           end
@@ -486,8 +496,8 @@ module Archipelago
         @local_services = ServiceLocker.new(:jockey => self)
         @subscribed_services = Set.new
 
-        @incoming = Archipelago::Current::Queue.new
-        @outgoing = Archipelago::Current::Queue.new
+        @incoming = Queue.new
+        @outgoing = Queue.new
 
         @new_service_semaphore = MonitorMixin::ConditionVariable.new(Archipelago::Current::Lock.new)
         @service_change_subscribers_by_event_type = {:found => {}, :lost => {}}
@@ -503,6 +513,9 @@ module Archipelago
       # Will listen for +event_type+s matching the Query +match+
       # and do +block+.call with the matching Record.
       #
+      # +identity+ is used to determine what subscription to remove
+      # when doing unsubscribe.
+      #
       # Recognized +event_types+: :found, :lost
       #
       def subscribe(event_type, match, identity, &block)
@@ -510,7 +523,7 @@ module Archipelago
       end
 
       #
-      # Will stop listening for +event_type+ and +match+.
+      # Will stop listening for +event_type+ and +match+ with +identity+.
       #
       def unsubscribe(event_type, match, identity)
         @service_change_subscribers_by_event_type[event_type].delete([match, identity])
@@ -588,12 +601,16 @@ module Archipelago
           @listener_thread.kill
           @unilistener_thread.kill
 
-          @incoming.empty?(true)
-          @picker_thread.kill
           @listener.close
           @unilistener.close
-
-          @outgoing.empty?(true)
+          while !@incoming.empty?
+            sleep 0.1
+          end
+          @picker_thread.kill
+          
+          while !@outgoing.empty?
+            sleep 0.1
+          end
           @shouter_thread.kill
           @sender.close
           @unisender.close
@@ -603,36 +620,41 @@ module Archipelago
       end
 
       #
-      # Lookup any services matching +match+, optionally with a +timeout+.
+      # Lookup any services matching +match+, optionally 
+      # with a +:timeout+ and optionally +:silent+.
       #
       # Will immediately return if we know of matching and valid services,
       # will otherwise send out regular Queries and return as soon as
       # matching services are found, or when the +timeout+ runs out.
       #
-      def lookup(match, timeout = @lookup_timeout)
+      def lookup(match, options = {})
+        timeout = options[:timeout] || @lookup_timeout
+        silent = options[:silent] || false
+
         match[:unicast_reply] = @unicast_address
         @subscribed_services << match if @thrifty_caching
         standoff = @initial_lookup_standoff
 
-        @outgoing << [nil, match]
+        @outgoing << [nil, match] unless silent
         known_services = @remote_services.get_services(match).merge(@local_services.get_services(match))
         return known_services if timeout == 0 || !known_services.empty?
 
         t = Time.new
         @new_service_semaphore.wait([standoff, timeout].min)
         standoff *= 2
-        
+
         while Time.new < t + timeout
           known_services = @remote_services.get_services(match).merge(@local_services.get_services(match))
           return known_services unless known_services.empty?
 
-          @new_service_semaphore.wait(standoff)
+          wait_time = [standoff, (t + timeout) - Time.new].min
+          @new_service_semaphore.wait(wait_time)
           standoff *= 2
 
-          @outgoing << [nil, match]
+          @outgoing << [nil, match] unless silent
         end
 
-        ServiceLocker.new
+        return ServiceLocker.new
       end
 
       #
@@ -786,7 +808,7 @@ module Archipelago
         @picker_thread = Thread.new do
           loop do
             begin
-              data = @incoming.shift
+              data = @incoming.pop
               if Archipelago::Disco::Query === data
                 @local_services.get_services(data).each do |service_id, service_data|
                   if @thrifty_replying

data/lib/archipelago/dump.rb

@@ -85,6 +85,7 @@ module Archipelago
       # Any values with a different timestamp will be deleted.
       #
       def insert!(key, values, timestamp = "\000\000\000\000")
+        @debug_callable.call("#{self.service_id}.insert!(#{key}, #{values.inspect}, #{timestamp.inspect}) called") if @debug_callable
         if (duplicates = @db.duplicates(key)).empty?
           values.each do |value|
             @db[key] = timestamp + value

data/lib/archipelago/hashish.rb

@@ -17,6 +17,7 @@
 
 require 'archipelago/current'
 require 'bdb'
+require 'rubygems'
 require 'archipelago_rbtree'
 
 module Archipelago

data/lib/archipelago/pirate.rb

@@ -21,7 +21,6 @@ require 'archipelago/treasure'
 require 'archipelago/client'
 require 'pp'
 require 'drb'
-require 'digest/sha1'
 
 module Archipelago
 
@@ -251,7 +250,7 @@ module Archipelago
       def responsible_chest(key)
         raise NoRemoteDatabaseAvailableException.new(self) if self.chests.empty?
 
-        return get_least_greater_than(:chests, Digest::SHA1.hexdigest(Marshal.dump(key)), 1).first
+        return get_least_greater_than(:chests, key, 1).first
       end
 
       #

data/lib/archipelago/sanitation.rb

@@ -17,6 +17,8 @@
 
 require 'archipelago/client'
 require 'archipelago/dump'
+require 'rubygems'
+require 'oneliner'
 require 'monitor'
 require 'drb'
 
@@ -93,7 +95,7 @@ module Archipelago
 
         options.merge!({
                          :service_descriptions => {
-                           :sites => Archipelago::Disco::Query.new(SITE_DESCRIPTION.merge(options[:site_description] || {}))
+                           :sites => SITE_DESCRIPTION.merge(options[:site_description] || {})
                          }
                        })
         setup_client(options)
@@ -115,6 +117,7 @@ module Archipelago
         dump_hash = responsible_sites(key)
         super_string.encode(8)
         dump_hash.t_each do |dump_id, nr_of_chunks_needed|
+          @debug_callable.call("calling #{dump_id}.insert!(#{key}, ..., #{t})") if @debug_callable
           self.sites[dump_id][:service].insert!(key, 
                                                 (0...nr_of_chunks_needed).collect do |nr_of_chunks_needed|
                                                   super_string.encode(chunk_size)
@@ -243,7 +246,7 @@ module Archipelago
           end
         end
 
-        if rval.decode_done?
+        if rval.done?
           return [rval.to_s, newest_timestamp]
         else
           raise NotEnoughDataException.new(self, key) if newest_timestamp != "\000\000\000\000"

data/lib/archipelago/treasure.rb

@@ -57,7 +57,7 @@ module Archipelago
     #
     class WrongChestException < RuntimeError
       def initialize(chest_id, predecessor_id, key)
-        super("#{key.inspect} is not between #{predecessor_id} and #{chest_id}, and should not be here")
+        super("#{key.inspect} is not between my predecessor (#{predecessor_id}) and me (#{chest_id}), and should not be here")
       end
     end
 
@@ -118,6 +118,17 @@ module Archipelago
     # method call itself within the home Chest of the proxied object.
     #
     class Dubloon
+      @@debug_callable = nil
+      def self.debug_callable=(c)
+        @@debug_callable = c
+      end
+      #
+      # Will return whether +o+ is an instance of Dubloon or one
+      # of its subclasses.
+      # 
+      def self.dubloon?(o)
+        return o.respond_to?(:dubloon?) && o.dubloon?
+      end
       #
       # Remove all methods so that we look like our target.
       #
@@ -138,12 +149,18 @@ module Archipelago
         self.==(o)
       end
       #
-      # If o is a Dubloon, will return true if it has the same Dubloon#object_id.
+      # Will return that this is a Dubloon.
+      #
+      def dubloon?
+        true
+      end
+      #
+      # If +o+ is a Dubloon, will return true if it has the same Dubloon#object_id.
       #
       # Otherwise will defer to Dubloon#method_missing.
       #
       def ==(o)
-        if Dubloon === o
+        if Dubloon.dubloon?(o)
           return true if self.object_id == o.object_id
         end
         return self.method_missing(:==, o)
@@ -202,7 +219,7 @@ module Archipelago
       # @chest_id, @key and possibly @transaction.
       #
       def object_id
-        id = "#{@chest_id}:#{@key}"
+        id = "Archipelago::Treasure::Dubloon:#{@key}@#{@chest_id}"
         id << ":#{@transaction.transaction_id}" if @transaction
         return id
       end
@@ -222,6 +239,7 @@ module Archipelago
         begin
           return @chest.call_instance_method(@key, meth, @transaction, *args, &block)
         rescue WrongChestException => e
+          @@debug_callable.call("#{self.object_id} got #{e} when trying to call #{meth}.#{args}") if @@debug_callable
           #
           # We just have to find the new chest we belong at now...
           #
@@ -237,6 +255,7 @@ module Archipelago
 
           retry
         rescue DRb::DRbConnError => e
+          @@debug_callable.call("#{self.object_id} got #{e} when trying to call #{meth}.#{args}") if @@debug_callable
           #
           # Here is some fancy rescuing being done.
           #
@@ -289,6 +308,8 @@ module Archipelago
       #
       include Archipelago::Disco::Publishable
 
+      attr_reader :captain
+
       #
       # Initialize a Chest
       #
@@ -438,7 +459,7 @@ module Archipelago
         instance = ensure_instance_with_transaction(key, transaction)
         return nil unless instance
         
-        if Dubloon === instance
+        if Dubloon.dubloon?(instance)
           return instance.join(transaction)
         else
           return Dubloon.new(key, self, transaction, self.service_id)
@@ -890,7 +911,7 @@ module Archipelago
       #
       def set(key, value, transaction)
         join!(transaction)
-        if Dubloon === value
+        if Dubloon.dubloon?(value)
           value.assert_transaction(transaction)
           #
           # Return the value if the value is in fact a proxy to what we are trying overwrite.
@@ -920,7 +941,7 @@ module Archipelago
           @db[key] = value
         end
 
-        return value if Dubloon === value
+        return value if Dubloon.dubloon?(value)
 
         return Dubloon.new(key, self, transaction, service_id)
       end

data/script/pirate.rb

@@ -8,4 +8,4 @@ rescue DRb::DRbServerNotFound
   DRb.start_service(ENV["DRBURI"])
 end
 @p = Archipelago::Pirate::Captain.new
-@p.evaluate!(File.join(File.dirname(__FILE__), 'overloads.rb'))
+@p.evaluate!(File.join(File.dirname(__FILE__), 'overloads.rb')) unless @p.chests.empty?

data/tests/current_test.rb

@@ -19,41 +19,6 @@ end
 
 class CurrentTest < Test::Unit::TestCase
 
-  def test_queue
-    q = Archipelago::Current::Queue.new
-    assert(q.empty?)
-    t = true
-    Thread.new do
-      e = q.shift
-      t = false
-    end
-    Thread.pass
-    assert(t)
-    q << "blar"
-    Thread.pass
-    sleep(0.1)
-    assert(!t)
-    
-    q << "bunke"
-    assert(!q.empty?)
-    q.shift
-    assert(q.empty?)
-
-    assert(q.empty?)
-    q << "hehu"
-    assert(!q.empty?)
-    Thread.new do
-      q.empty?(true)
-      t = true
-    end
-    Thread.pass
-    assert(!t)
-    q.shift
-    Thread.pass
-    assert(t)
-    assert(q.empty?)
-  end
-
   def test_synchronized
     t = true
 

data/tests/disco_benchmark.rb

@@ -9,12 +9,12 @@ class DiscoBenchmark < Test::Unit::TestCase
     x = 0
     bm("Jockey#publish/lookup", :n => 10) do
       dj1.publish(Archipelago::Disco::Record.new({:service_id => x.to_s, :validator => Archipelago::Disco::MockValidator.new}))
-      assert(!dj2.lookup(Archipelago::Disco::Query.new({:service_id => x.to_s})).empty?)
+      assert(!dj2.lookup(Archipelago::Disco::Query.new({:service_id => x.to_s}), :timeout => 2).empty?)
       x += 1
     end
     dj1.publish(Archipelago::Disco::Record.new({:service_id => "brappa", :validator => Archipelago::Disco::MockValidator.new}))
     bm("Jockey#lookup", :n => 10) do
-      assert(!dj2.lookup(Archipelago::Disco::Query.new({:service_id => "brappa"})).empty?)
+      assert(!dj2.lookup(Archipelago::Disco::Query.new({:service_id => "brappa"}), :timeout => 2).empty?)
     end
   end
 

data/tests/disco_test.rb

@@ -24,7 +24,7 @@ class DiscoTest < Test::Unit::TestCase
                                          :validator => DRbObject.new(@v1),
                                          :epa => "blar")
     @d1.publish(@p1)
-    assert(!@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar")).empty?)
+    assert(!@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar"), :timeout => 2).empty?)
 
     @listener = UDPSocket.new
     @listener.setsockopt(Socket::IPPROTO_IP, 
@@ -76,7 +76,7 @@ class DiscoTest < Test::Unit::TestCase
 
     empty = true
     Thread.new do
-      empty = @d2.lookup(Archipelago::Disco::Query.new(:epa => "blar2")).empty?
+      empty = @d2.lookup(Archipelago::Disco::Query.new(:epa => "blar2"), :timeout => 2).empty?
     end
 
     assert(empty)
@@ -93,6 +93,39 @@ class DiscoTest < Test::Unit::TestCase
     assert(!found_wrong)
   end
 
+  def test_unsubscribe
+    @v1.valid = false
+
+    lost_it = false
+    
+    @d2.subscribe(:lost, Archipelago::Disco::Query.new(:epa => "blar"), 1) do
+      lost_it = true
+    end
+    @d2.unsubscribe(:lost, Archipelago::Disco::Query.new(:epa => "blar"), 1)
+
+    assert(@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar"), :timeout => 0).validate!.empty?)
+
+    @d2.validate!
+
+    assert(!lost_it)
+  end
+
+  def test_subscribe
+    @v1.valid = false
+
+    lost_it = false
+    
+    @d2.subscribe(:lost, Archipelago::Disco::Query.new(:epa => "blar"), 1) do
+      lost_it = true
+    end
+
+    assert(@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar"), :timeout => 0).validate!.empty?)
+
+    @d2.validate!
+
+    assert(lost_it)
+  end
+
   def test_publish_invalidate
     @v1.valid = false
 
@@ -110,7 +143,7 @@ class DiscoTest < Test::Unit::TestCase
     end
     @d2.unsubscribe(:lost, Archipelago::Disco::Query.new(:epa => "blarx"), 2)
 
-    assert(@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar"), 0).validate!.empty?)
+    assert(@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar"), :timeout => 0).validate!.empty?)
 
     @d2.validate!
 
@@ -147,7 +180,7 @@ class DiscoTest < Test::Unit::TestCase
     assert(@ltq.empty?, "we got messages while we shouldnt: #{@ltq.inspect}")
 
     c1 = Archipelago::Disco::Jockey.new(:thrifty_publishing => true)
-    assert(!c1.lookup(Archipelago::Disco::Query.new(:glad => "ja")).empty?)
+    assert(!c1.lookup(Archipelago::Disco::Query.new(:glad => "ja"), :timeout => 2).empty?)
 
     c1.stop!
     c3.stop!
@@ -159,7 +192,7 @@ class DiscoTest < Test::Unit::TestCase
                                                :service_id => 3444))
     
     @ltq.clear
-    assert(!@d2.lookup(Archipelago::Disco::Query.new(:gladaa => "jaaa")).empty?)
+    assert(!@d2.lookup(Archipelago::Disco::Query.new(:gladaa => "jaaa"), :timeout => 2).empty?)
     assert(@ltq.any? do |d|
              o = Marshal.load(d)
              case o
@@ -181,7 +214,7 @@ class DiscoTest < Test::Unit::TestCase
     @ltq.clear
 
     c1 = Archipelago::Disco::Jockey.new
-    assert(!c1.lookup(Archipelago::Disco::Query.new(:glad2 => "ja2"), 2).empty?)
+    assert(!c1.lookup(Archipelago::Disco::Query.new(:glad2 => "ja2"), :timeout => 2).empty?)
 
     assert(!@ltq.any? do |data|
              o = Marshal.load(data)

data/tests/pirate_test.rb

@@ -111,6 +111,7 @@ class PirateTest < Test::Unit::TestCase
 
     p2 = Archipelago::Pirate::Captain.new(:chest_description => {:class => "TestChest"}, 
                                           :tranny_description => {:class => "TestManager"},
+                                          :initial_lookup_timeout => 5,
                                           :chest_eval_files => [File.join(File.dirname(__FILE__), 'evaltest')])
 
     assert_within(10) do
@@ -185,13 +186,16 @@ class PirateTest < Test::Unit::TestCase
   end
 
   def test_wrong_chest_exception
-    chests = [@c, @c2].sort do |a,b|
-      a.service_id <=> b.service_id
-    end
+    k = Digest::SHA1.hexdigest("hehu")
+    resp_ch = @p.responsible_chest(k)[:service]
+    irresp_ch = resp_ch == @c2 ? @c : @c2
     begin
       $DO_ASSERT_MINE = true
       assert_raise(Archipelago::Treasure::WrongChestException) do
-        chests.last.call_instance_method(chests.last.service_id.next, :bruhuf, nil)
+        irresp_ch.call_instance_method(k, :bruhuf, nil)
+      end
+      assert_raise(Archipelago::Treasure::UnknownObjectException) do
+        resp_ch.call_instance_method(k, :bruff, nil)
       end
     ensure
       $DO_ASSERT_MINE = false

data/tests/sanitation_test.rb

@@ -74,6 +74,8 @@ class SanitationTest < Test::Unit::TestCase
     dumps = []
     cleaner2 = Archipelago::Sanitation::Officer.new(:minimum_nr_of_chunks => 3,
                                                     :initial_lookup_timeout => 0)
+    print "(setup cleaner)"
+    STDOUT.flush
     begin
       10.times do |n|
         dumps[n] = Archipelago::Dump::Site.new(:officer => cleaner2,
@@ -81,6 +83,8 @@ class SanitationTest < Test::Unit::TestCase
                                                :persistence_directory => Pathname.new(__FILE__).parent.join("master_test_#{n}.db"))
         dumps[n].publish!
       end
+      print "(created dumps)"
+      STDOUT.flush
       #
       # Wait until it is alive
       #
@@ -88,6 +92,8 @@ class SanitationTest < Test::Unit::TestCase
         cleaner2.update_services!
         dumps.collect do |d| d.service_id end.sort == cleaner2.sites.keys.sort
       end
+      print "(updated services)"
+      STDOUT.flush
       #
       # Perform checks on all dumps
       #
@@ -109,6 +115,8 @@ class SanitationTest < Test::Unit::TestCase
           assert_equal(dumps[9].service_id, cleaner2.predecessor(dumps[0].service_id))
         end
       end
+      print "(tested relations)"
+      STDOUT.flush
       #
       # Check that only fresh data is returned
       #
@@ -121,6 +129,8 @@ class SanitationTest < Test::Unit::TestCase
       assert(cleaner2.responsible_sites("a").include?(dumps[0].service_id))
       assert(cleaner2.responsible_sites("a").include?(dumps[1].service_id))
       assert_equal(s2.to_s, cleaner2["a"])
+      print "(tested timestamps)"
+      STDOUT.flush
       #
       # Check the utility methods of sanitation
       #
@@ -136,6 +146,8 @@ class SanitationTest < Test::Unit::TestCase
                    cleaner2.second_master_to(dumps[4].service_id))
       assert_equal(dumps[9].service_id,
                    cleaner2.second_master_to(dumps[0].service_id))
+      print "(tested recovery relations)"
+      STDOUT.flush
       #
       # Check the recovery methods
       #
@@ -167,41 +179,49 @@ class SanitationTest < Test::Unit::TestCase
       }
       assert_equal(healthy_chunks,
                    chunks_by_id(cleaner2, "a"))
+      print "(tested basic recovery)"
+      STDOUT.flush
       dumps[1].close!
       cleaner2.update_services!(:validate => true)
       dumps[0].instance_eval do lost_peer({:service_id => dumps[1].service_id}) end
       dumps[2].instance_eval do lost_peer({:service_id => dumps[1].service_id}) end
       assert_equal({"6"=>0, "7"=>0, "8"=>0, "9"=>0, "0"=>1, "2"=>1, "3"=>1, "4"=>0, "5"=>0},
                    chunks_by_id(cleaner2, "a"))
-
+      print "(tore down service)"
       dumps[1] = Archipelago::Dump::Site.new(:officer => cleaner2,
                                              :service_description => {:service_id => "1"},
                                              :persistence_directory => Pathname.new(__FILE__).parent.join("master_test_1.db"))
       dumps[1].publish!
       begin
         assert_within(20) do
-          cleaner2.update_services!
+          cleaner2.update_services!(:validate => true)
           ["0","1","2","3","4","5","6","7","8","9"].sort == cleaner2.sites.keys.sort
         end
       rescue Test::Unit::AssertionFailedError => e
         pp chunks_by_id(cleaner2, "a")
         raise e
       end
+      print "(restarted service)"
+      STDOUT.flush
       assert_equal({"0"=>1, "1"=>1, "2"=>1},
                    cleaner2.responsible_sites("a"))
+
       dumps[3].instance_eval do @edge_check_thread.wakeup end
-      cleaner2.update_services!(:validate => true)
+
       begin
         assert_within(20) do
+          cleaner2.update_services!(:validate => true)
           chunks_by_id(cleaner2, "a") == healthy_chunks
         end
       rescue Test::Unit::AssertionFailedError => e
         pp chunks_by_id(cleaner2, "a")
         raise e
       end
+      print "(asserted auto recovery)"
+      STDOUT.flush
     ensure
       dumps.extend(Archipelago::Current::ThreadedCollection)
-      dumps.t_each do |dump|
+      dumps.each do |dump|
         dump.close!
         dump.instance_eval do @persistence_provider.unlink! end
       end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.0
 specification_version: 1
 name: archipelago
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
-date: 2007-05-14 00:00:00 +02:00
+  version: 0.3.0
+date: 2007-06-07 00:00:00 +02:00
 summary: A set of tools for distributed computing in ruby.
 require_paths: 
 - lib
@@ -29,46 +29,46 @@ post_install_message:
 authors: 
 - Martin Kihlgren
 files: 
-- lib/archipelago/client.rb
-- lib/archipelago/current.rb
-- lib/archipelago/disco.rb
-- lib/archipelago/dump.rb
+- lib/archipelago/tranny.rb
 - lib/archipelago/hashish.rb
+- lib/archipelago/dump.rb
+- lib/archipelago/current.rb
+- lib/archipelago/treasure.rb
+- lib/archipelago/client.rb
 - lib/archipelago/pirate.rb
+- lib/archipelago/disco.rb
 - lib/archipelago/sanitation.rb
-- lib/archipelago/tranny.rb
-- lib/archipelago/treasure.rb
 - lib/archipelago.rb
-- tests/current_benchmark.rb
-- tests/current_test.rb
-- tests/disco_benchmark.rb
-- tests/disco_test.rb
-- tests/dump_test.rb
+- tests/test_helper.rb
+- tests/treasure_benchmark.rb
 - tests/evaltest
 - tests/evaltestmore
-- tests/pirate_test.rb
+- tests/treasure_test.rb
+- tests/tranny_test.rb
+- tests/current_benchmark.rb
 - tests/sanitation_benchmark.rb
+- tests/dump_test.rb
 - tests/sanitation_test.rb
-- tests/test_helper.rb
-- tests/tranny_test.rb
-- tests/treasure_benchmark.rb
-- tests/treasure_test.rb
-- script/console.rb
-- script/officer.rb
+- tests/current_test.rb
+- tests/pirate_test.rb
+- tests/disco_test.rb
+- tests/disco_benchmark.rb
 - script/overloads.rb
-- script/pirate.rb
 - script/services.rb
+- script/officer.rb
+- script/console.rb
+- script/pirate.rb
 - GPL-2
 - TODO
 - README
 test_files: 
-- tests/current_test.rb
-- tests/disco_test.rb
+- tests/treasure_test.rb
+- tests/tranny_test.rb
 - tests/dump_test.rb
-- tests/pirate_test.rb
 - tests/sanitation_test.rb
-- tests/tranny_test.rb
-- tests/treasure_test.rb
+- tests/current_test.rb
+- tests/pirate_test.rb
+- tests/disco_test.rb
 - tests/test_helper.rb
 rdoc_options: 
 - --line-numbers
@@ -89,7 +89,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.7
+        version: 0.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fastthread
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: archipelago_rbtree
@@ -98,5 +107,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.7
+        version: 0.3.0
     version: