tem_mr_search 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.2. Map-Reduce timing statistics available in the results.
+
 v0.3.1. Optimized Map-Reduce scheduler. 1.5x speed increase.
 
 v0.3. SECpack binding and migration. Now we're secure.

data/bin/tem_mr_search_server

@@ -11,4 +11,6 @@ end
 Thread.abort_on_exception = true
 db_file, cluster_file, server_port = ARGV[0], ARGV[1], ARGV[2]
 server = Tem::Mr::Search::Server.new db_file, cluster_file, server_port
+default_port = Tem::Mr::Search::Server::DEFAULT_PORT
+print "Serving on port #{server_port || default_port}\n"
 server.serve_loop

data/lib/tem_mr_search/map_reduce_executor.rb

@@ -49,7 +49,7 @@ class MapReduceExecutor
     # Protected by @lock
     @timings = { :tems => Array.new(@tems.length, 0.0),
                  :tasks => { :map => 0.0, :reduce => 0.0, :finalize => 0.0,
-                             :migrate => 0.0 } }
+                             :migrate => 0.0, :tem_ids => 0.0 } }
     
     # Thread-safe.
     @thread_queues = tems.map { |tem| Queue.new }
@@ -63,6 +63,7 @@ class MapReduceExecutor
   #   :result:: the job's result
   #   :timings:: timing statistics on the job's execution 
   def execute
+    t0 = Time.now
     collect_tem_ids
     
     # Spawn TEM threads.
@@ -77,6 +78,7 @@ class MapReduceExecutor
       action = @main_queue.pop
       @planner.action_done action
     end
+    @timings[:total] = Time.now - t0
     
     return { :result => @outputs[@planner.output_id], :timings => @timings }
   end  
@@ -85,8 +87,14 @@ class MapReduceExecutor
   def collect_tem_ids
     threads = (0...@tems.length).map do |tem_index|
       Thread.new(tem_index, @tems[tem_index]) do |index, tem|
+        t0 = Time.now
         ecert = tem.endorsement_cert
-        @lock.synchronize { @tem_certs[index] = ecert }
+        time_delta = Time.now - t0
+        @lock.synchronize do
+          @tem_certs[index] = ecert
+          @timings[:tasks][:tem_ids] += time_delta
+          @timings[:tems][index] += time_delta
+        end
       end
     end
     threads.each { |thread| thread.join }

data/lib/tem_mr_search/server.rb

@@ -80,7 +80,7 @@ class Server
   end
   
   # Computes the response of a single request.
-  def process_request(request)    
+  def process_request(request)
     case request[:type]
     when :search
       refresh_tems!

data/tem_mr_search.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_mr_search}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/test/test_map_reduce_executor.rb

@@ -35,11 +35,12 @@ class MapReduceExecutorTest < MrTestCase
   
     assert data[:timings], 'No timings returned'
     assert data[:timings][:tasks], 'No tasks data in the timings'
-    [:map, :reduce, :finalize, :migrate].each do |task|
+    [:tem_ids, :migrate, :map, :reduce, :finalize].each do |task|
       assert data[:timings][:tasks][task], "No data on #{task} in the timings"
     end
     assert_operator data[:timings][:tems], :kind_of?, Array,
                     'No per-TEM data in the timings'
+    assert data[:timings][:total], 'No total time in the timings'
 
     # Dump timing stats to show scheduler performance.
     p data[:timings]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_mr_search
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Victor Costan