remove dead DRb code from codebase

Author: qxjit

infrastructure/drb_test_help.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + "/timewarp/lib/timewarp"
 require File.dirname(__FILE__) + "/fake_deadlock_error"
-require File.dirname(__FILE__) + "/drb_test_help"
 require File.dirname(__FILE__) + "/test_central_command"
 require File.dirname(__FILE__) + "/test_factory"
 require File.dirname(__FILE__) + "/test_logger"

infrastructure/load.rb

@@ -11,35 +11,6 @@ def logger=(logger)
     end
   end  
 
-  # Fork in a separate thread.  If we fork from a DRb thread
-  #  (a thread handling a method call invoked over drb),
-  #  DRb still thinks the current object is the DRb Front Object,
-  #  and reports its uri as the same as in the parent process, even
-  #  if you restart DRb service.
-  #
-  # Stop all drb servers in child process to ensure that objects passed
-  #  over drb to children are treated as remote objects.
-  #
-  def self.drb_safe_fork
-    Thread.new do
-      Process.fork do
-        DRb.stop_service # stop the primary server
-        DRb.instance_variable_get(:@server).values.each do |server|
-          server.stop_service
-        end
-        DRb::DRbConn.instance_eval do
-          @mutex.synchronize do
-            @pool.each do |conn|
-              conn.close if conn.alive?
-            end
-            @pool.clear
-          end
-        end
-        yield
-      end
-    end.value
-  end
-
   def self.init(options)
     return if @initialized
     @initialized = true
@@ -58,7 +29,6 @@ def backtrace
 end
 
 require "logger"
-require "drb"
 require "timeout"
 require "thread"
 require "socket"
@@ -68,7 +38,6 @@ def backtrace
 
 require File.dirname(__FILE__) + "/telegraph"
 require File.dirname(__FILE__) + "/deep_test/extensions/object_extension"
-require File.dirname(__FILE__) + "/deep_test/extensions/drb_extension"
 
 require File.dirname(__FILE__) + "/deep_test/demon"
 require File.dirname(__FILE__) + "/deep_test/deadlock_detector"

lib/deep_test.rb

@@ -34,8 +34,6 @@ def execute
       end
     rescue CentralCommand::NoWorkUnitsRemainingError
       DeepTest.logger.debug { "Agent #{number}: no more work to do" }
-    rescue DRb::DRbConnError, Timeout::Error
-      DeepTest.logger.debug { "Unable to contact DRb server.  Exiting" }
     end
 
     def next_work_unit

lib/deep_test/agent.rb

@@ -1,7 +1,7 @@
 module DeepTest
   module Distributed
     class Beachhead < LocalDeployment
-      include Demon, DRb::DRbUndumped
+      include Demon
 
       MERCY_KILLING_GRACE_PERIOD = 10 * 60 unless defined?(MERCY_KILLING_GRACE_PERIOD)
 

lib/deep_test/distributed/beachhead.rb

@@ -36,11 +36,6 @@ def dispatch_with_options(method_name, options, *args)
           rescue Timeout::Error
             @receivers.delete t[:receiver]
             DeepTest.logger.error { "Timeout dispatching #{method_name} to #{description t[:receiver]}" }
-          rescue DRb::DRbConnError
-            @receivers.delete t[:receiver]
-            unless options[:ignore_connection_error]
-              DeepTest.logger.error { "Connection Refused dispatching #{method_name} to #{description t[:receiver]}" }
-            end
           rescue Exception => this_exception
             @receivers.delete t[:receiver]
             DeepTest.logger.error { "Exception while dispatching #{method_name} to #{description t[:receiver]}:" }
@@ -57,7 +52,7 @@ def dispatch_with_options(method_name, options, *args)
       end
 
       def description(receiver)
-        receiver.__drburi rescue receiver.inspect
+        receiver.inspect
       end
 
     end

lib/deep_test/distributed/dispatch_controller.rb

@@ -60,8 +60,7 @@ def origin_hostname
     end
 
     # Don't store UI instances in the options instance, which will
-    # need to be dumped over DRb.  UI instances may not be dumpable
-    # and we don't want to have to start yet another DRb Server
+    # need to be dumped over Telegraph since UI instances may not be dumpable.
     #
     UI_INSTANCES = {} unless defined?(UI_INSTANCES)
     def ui_instance

lib/deep_test/extensions/drb_extension.rb

@@ -15,7 +15,7 @@ def start(name, demon, *demon_args)
       begin
         pid = nil
         @demons_semaphore.synchronize do 
-          pid = DeepTest.drb_safe_fork do
+          pid = fork do
             # Fork leaves the semaphore locked and we'll never make it
             # to end of synchronize block.
             #

lib/deep_test/options.rb

@@ -110,7 +110,7 @@ def ==(other)
 
     test "Agent::Error can marshal itself even if the contents are not marshallable" do
       o = Object.new
-      o.extend DRb::DRbUndumped
+      def o._dump; raise "error"; end
 
       error = Agent::Error.new o, Exception.new("my error")
       error_through_marshalling = Marshal.load Marshal.dump(error)

lib/deep_test/warlock.rb

@@ -81,24 +81,6 @@ def receiver.sleep_100_millis
         controller.dispatch(:method_call_2)
       end
 
-      test "receiver is dropped when connection is refused" do
-        receiver_1, receiver_2 = mock, mock
-        receiver_1.expects(:method_call_1).raises(DRb::DRbConnError)
-        receiver_1.expects(:method_call_2).never
-
-        receiver_2.expects(:method_call_1).returns(:value)
-        receiver_2.expects(:method_call_2)
-
-        controller = DispatchController.new(
-          Options.new({:ui => "UI::Null", :timeout_in_seconds => 0.05}),
-          [receiver_1, receiver_2]
-        )
-
-        assert_equal [:value], controller.dispatch(:method_call_1)
-
-        controller.dispatch(:method_call_2)
-      end
-      
       test "receiver is dropped when any exception occurs" do
         receiver = mock
         receiver.expects(:method_call).raises(Exception)
@@ -132,20 +114,6 @@ def receiver.sleep_100_millis
         end_log
       end
 
-      test "no error is printed if dispatching without error" do
-        receiver_1 =  mock
-        receiver_1.expects(:method_call_1).raises(DRb::DRbConnError)
-
-        controller = DispatchController.new(
-          Options.new({:ui => "UI::Null", :timeout_in_seconds => 0.05}),
-          [receiver_1]
-        )
-
-        DeepTest.logger.expects(:error).never
-
-        controller.dispatch_with_options(:method_call_1, :ignore_connection_error => true)
-      end
-
       test "dispatch calls notifies ui of start and stop of dispatch" do
         options = Options.new({:ui => "UI::Null"})
         controller = DispatchController.new(