tem_mr_search 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.3. Slightly more robust communication code in the RPC server/client.
+
 v0.2.2. Switched to smartcard API 0.4.
 
 v0.2.1. Check for cluster configuration on each query.

data/Rakefile

@@ -3,17 +3,17 @@ gem 'echoe'
 require 'echoe'
 
 Echoe.new('tem_mr_search') do |p|
-  p.project = 'tem' # rubyforge project
+  p.project = 'tem'  # rubyforge project
   p.docs_host = "costan@rubyforge.org:/var/www/gforge-projects/tem/rdoc/"
   
   p.author = 'Victor Costan'
   p.email = 'victor@costan.us'
   p.summary = 'Tem Map-Reduce proof of concept: database search.'
   p.url = 'http://tem.rubyforge.org'
-  p.dependencies = ['tem_ruby >=0.11.2', 'tem_multi_proxy >=0.2']
+  p.dependencies = ['tem_ruby >=0.13.0', 'tem_multi_proxy >=0.2.6']
   
-  p.need_tar_gz = !Platform.windows?
-  p.need_zip = !Platform.windows?
+  p.need_tar_gz = !Gem.win_platform?
+  p.need_zip = !Gem.win_platform?
   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/  
 end
 

data/lib/tem_mr_search/client.rb

@@ -3,7 +3,7 @@ module Tem::Mr::Search
 
 class Client
   OP = Zerg::Support::Protocols::ObjectProtocol
-  OPAdapter  = Zerg::Support::Sockets::ProtocolAdapter.adapter_module OP
+  OPAdapter = Zerg::Support::Sockets::ProtocolAdapter.adapter_module OP
   
   # Performs a private database search using a Map-Reduce.
   def self.search(server_addr, client_query)
@@ -38,13 +38,9 @@ class Client
     socket = Zerg::Support::SocketFactory.socket :out_addr => server_addr,
         :out_port => Server::DEFAULT_PORT
     socket.extend OPAdapter
-    begin
-      socket.send_object request
-      response = socket.recv_object response
-    rescue
-      response = nil
-    end
-    socket.close rescue nil
+    socket.send_object request
+    response = socket.recv_object response
+    socket.close
     response
   end
 end

data/lib/tem_mr_search/server.rb

@@ -18,6 +18,9 @@ class Server
     @tems = []
     refresh_tems!
     @port = port || DEFAULT_PORT
+    
+    @listen_socket = Zerg::Support::SocketFactory.socket :in_port => @port,
+                                                         :reuse_addr => true    
   end
   
   # Reinitializes the TEM cluster connections.
@@ -30,29 +33,28 @@ class Server
   end
 
   # This server's loop.
-  def serve_loop
-    listen_socket = Zerg::Support::SocketFactory.socket :in_port => @port
-    listen_socket.listen
-    shutdown_received = false
-    until shutdown_received
+  def serve_loop    
+    @listen_socket.listen
+    @shutdown_received = false
+    until @shutdown_received
       begin
-        client_socket, client_addr = listen_socket.accept
+        client_socket, client_addr = @listen_socket.accept
         client_socket.extend OPAdapter
         request = client_socket.recv_object
         begin
           response = process_request request
         rescue Exception => e
           @logger.error e
-          response = nil
+          response = :error
         end        
-        client_socket.send_object response if response
-        shutdown_received = true if response == :shutdown
-      rescue Exception => e
+        client_socket.send_object response
+        @shutdown_received = true if response == :shutdown
+      rescue RuntimeError => e
         @logger.error e
       end
       client_socket.close
     end
-    listen_socket.close
+    @listen_socket.close
   end
   
   # Computes the response of a single request.

data/tem_mr_search.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_mr_search}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2009-11-11}
   s.default_executable = %q{tem_mr_search_server}
   s.description = %q{Tem Map-Reduce proof of concept: database search.}
   s.email = %q{victor@costan.us}
@@ -19,21 +19,21 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{tem}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Tem Map-Reduce proof of concept: database search.}
-  s.test_files = ["test/test_client_server.rb", "test/test_db.rb", "test/test_map_reduce_executor.rb", "test/test_map_reduce_job.rb", "test/test_map_reduce_planner.rb", "test/test_query_builders.rb"]
+  s.test_files = ["test/test_query_builders.rb", "test/test_map_reduce_job.rb", "test/test_client_server.rb", "test/test_map_reduce_planner.rb", "test/test_db.rb", "test/test_map_reduce_executor.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tem_ruby>, [">= 0.11.2"])
-      s.add_runtime_dependency(%q<tem_multi_proxy>, [">= 0.2"])
+      s.add_runtime_dependency(%q<tem_ruby>, [">= 0.13.0"])
+      s.add_runtime_dependency(%q<tem_multi_proxy>, [">= 0.2.6"])
     else
-      s.add_dependency(%q<tem_ruby>, [">= 0.11.2"])
-      s.add_dependency(%q<tem_multi_proxy>, [">= 0.2"])
+      s.add_dependency(%q<tem_ruby>, [">= 0.13.0"])
+      s.add_dependency(%q<tem_multi_proxy>, [">= 0.2.6"])
     end
   else
-    s.add_dependency(%q<tem_ruby>, [">= 0.11.2"])
-    s.add_dependency(%q<tem_multi_proxy>, [">= 0.2"])
+    s.add_dependency(%q<tem_ruby>, [">= 0.13.0"])
+    s.add_dependency(%q<tem_multi_proxy>, [">= 0.2.6"])
   end
 end

data/test/test_client_server.rb

@@ -9,15 +9,25 @@ class ClientServerTest < MrTestCase
   def setup
     super
     @server_port = 29550
+    @thread_abort = Thread.abort_on_exception
+    Thread.abort_on_exception = true
+  end
+  
+  def teardown
+    Thread.abort_on_exception = @thread_abort
+    super
   end
     
   def _test_request
-    Thread.new do
-      Server.new(@db_path, @empty_cluster_file, @server_port).serve_loop
+    server = Server.new(@db_path, @empty_cluster_file, @server_port)
+    server_thread = Thread.new do
+      server.serve_loop
     end
-    sleep 0.1
+    Kernel.sleep 0.1  # Wait for the server to start.
     yield "localhost:#{@server_port}"
     Client.shutdown_server "localhost:#{@server_port}"
+    server_thread.join
+    Kernel.sleep 0.1  # Wait for the server to cleanup after itself.
   end
   
   def test_fetch_item
@@ -28,7 +38,6 @@ class ClientServerTest < MrTestCase
   end
   
   def test_dump_database
-    @server_port = 29557
     _test_request do |server_addr|
       items = Client.dump_database server_addr
       assert_equal @db.length, items.length, 'Wrong number of items'
@@ -39,7 +48,6 @@ class ClientServerTest < MrTestCase
   end
   
   def test_query
-    @server_port = 29551
     flexmock(Server).should_receive(:tems_from_cluster_file).
                      with(@empty_cluster_file).and_return do |file|
       Tem.auto_conf

data/test/test_map_reduce_executor.rb

@@ -6,14 +6,17 @@ class MapReduceExecutorTest < MrTestCase
   def setup
     super
     Tem.auto_conf
-    $tem.activate
-    $tem.emit
+    $tem.emit if $tem.activate
+    @thread_abort = Thread.abort_on_exception
+    Thread.abort_on_exception = true
   end
   
   def teardown
+    Thread.abort_on_exception = @thread_abort
     $tem.disconnect
+    super
   end
-    
+      
   def _test_executor(tems, root_tem)
     executor = MRExecutor.new @client_query, @db, tems, root_tem
     packed_output = executor.execute
@@ -33,7 +36,7 @@ class MapReduceExecutorTest < MrTestCase
     tems = Tem::Mr::Search::Server.tems_from_cluster_file @cluster_file
     assert_equal 8, tems.length, 'Incorrect cluster setup'
     
-    tems.each { |tem| tem.activate; tem.emit }
+    tems.each { |tem| tem.emit if tem.activate }
     
     _test_executor tems, 0
   end

data/testdata/cluster.yml

@@ -1,3 +1,3 @@
 ---
-- darkbulb2.local
-- lightbulb2.local
+- darkbulb2.csail.mit.edu
+- lightbulb2.csail.mit.edu

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_mr_search
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -04:00
+date: 2009-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.11.2
+        version: 0.13.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: tem_multi_proxy
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: 0.2.6
     version: 
 description: "Tem Map-Reduce proof of concept: database search."
 email: victor@costan.us
@@ -120,9 +120,9 @@ signing_key:
 specification_version: 3
 summary: "Tem Map-Reduce proof of concept: database search."
 test_files: 
+- test/test_query_builders.rb
+- test/test_map_reduce_job.rb
 - test/test_client_server.rb
+- test/test_map_reduce_planner.rb
 - test/test_db.rb
 - test/test_map_reduce_executor.rb
-- test/test_map_reduce_job.rb
-- test/test_map_reduce_planner.rb
-- test/test_query_builders.rb