drbqs 0.0.18 → 0.0.19

data/lib/drbqs/node/node.rb

@@ -15,13 +15,13 @@ module DRbQS
     OUTPUT_NOT_SEND_RESULT = 'not_send_result'
     DEFAULT_LOG_FILE = 'drbqs_client.log'
     INTERVAL_TIME_DEFAULT = 0.1
+    WAIT_NEW_TASK_TIME = 1
     SAME_HOST_GROUP = :local
 
     # @param [String] acces_uri Set the uri of server
     # @param [Hash] opts Options of a node
     # @option opts [Fixnum] :process Number of worker processes
     # @option opts [Array] :group An array of group symbols
-    # @option opts [Boolean] :continue If we set true then the node process does not exit
     # @option opts [Fixnum] :sleep_time Time interval during sleep of the node
     # @option opts [String] :max_loadavg Note that this optiono is experimental
     def initialize(access_uri, opts = {})
@@ -31,7 +31,6 @@ module DRbQS
       @task_client = nil
       @worker_number = opts[:process] || 1
       @state = DRbQS::Node::State.new(:wait, @worker_number, :max_loadavg => opts[:max_loadavg], :sleep_time => opts[:sleep_time])
-      @process_continue = opts[:continue]
       @group = opts[:group] || []
       @signal_to_server_queue = Queue.new
       @config = DRbQS::Config.new
@@ -199,7 +198,6 @@ module DRbQS
         flag_finalize_exit = true
       when :exit_after_task
         @state.set_exit_after_task
-        @process_continue = nil
       end
       if flag_finalize_exit
         execute_finalization
@@ -231,7 +229,7 @@ module DRbQS
     private :clear_node_files
 
     def wait_interval_of_connection
-      sleep(INTERVAL_TIME_DEFAULT)
+      Kernel.sleep(INTERVAL_TIME_DEFAULT)
     end
     private :wait_interval_of_connection
 
@@ -241,8 +239,8 @@ module DRbQS
       end
     end
 
-    MAX_WAIT_FINISH = 3
-    WAIT_INTERVAL = 0.1
+    MAX_WORKER_WAIT_TIME = 3
+    WORKER_WAIT_INTERVAL = 0.1
 
     def respond_worker_signal
       @worker.respond_signal
@@ -256,13 +254,13 @@ module DRbQS
         respond_worker_signal
         if !@worker.has_process?
           break
-        elsif total_wait_time > MAX_WAIT_FINISH
+        elsif total_wait_time > MAX_WORKER_WAIT_TIME
           # Kill worker processes forcibly.
           @worker.kill_all_processes
           break
         end
-        sleep(WAIT_INTERVAL)
-        total_wait_time += WAIT_INTERVAL
+        sleep(WORKER_WAIT_INTERVAL)
+        total_wait_time += WORKER_WAIT_INTERVAL
       end
       send_result_to_server
     end
@@ -271,6 +269,7 @@ module DRbQS
     def calculate(opts = {})
       set_signal_trap
       begin
+        server_has_no_task = nil
         loop do
           send_result_to_server
           unless process_signal_for_server
@@ -279,11 +278,17 @@ module DRbQS
           if @state.change_to_sleep_for_busy_system
             @logger.info("Sleep because system is busy.")
           end
+          if server_has_no_task && (t = server_has_no_task + WAIT_NEW_TASK_TIME - Time.now) > 0
+            sleep(t)
+            server_has_no_task = nil
+          end
           if get_new_task
             send_task_to_worker
-          elsif @state.all_workers_waiting? && !@process_continue
+          elsif @state.ready_to_exit_after_task? && @task_client.result_empty?
             execute_finalization
             break
+          elsif @state.request?
+            server_has_no_task = Time.now
           end
           unless respond_worker_signal
             wait_interval_of_connection

data/lib/drbqs/node/state.rb

@@ -55,7 +55,7 @@ module DRbQS
       end
 
       def request?
-        request_task_number > 0
+        @state_after_task != :exit && request_task_number > 0
       end
 
       def all_workers_waiting?
@@ -169,6 +169,10 @@ module DRbQS
         end
         nil
       end
+
+      def ready_to_exit_after_task?
+        @state_after_task == :exit && all_workers_waiting?
+      end
     end
   end
 end

data/lib/drbqs/node/task_client.rb

@@ -71,7 +71,7 @@ module DRbQS
             break
           end
         end
-        get_task_id.empty? ? nil: get_task_id
+        get_task_id.empty? ? nil : get_task_id
       end
 
       # Return an array of task ID that is sent to the server.

data/lib/drbqs/version.rb

@@ -1,3 +1,3 @@
 module DRbQS
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

data/lib/drbqs/worker/worker.rb

@@ -105,8 +105,12 @@ module DRbQS
     # @param [Fixnum] task_id
     # @param [Numeric] interval_time An argument of Kernel#sleep.
     def wait(task_id, interval_time)
-      while @task_pool[task_id]
-        unless step
+      if @task_pool[task_id]
+        loop do
+          step
+          unless @task_pool[task_id]
+            return true
+          end
           Kernel.sleep(interval_time)
         end
       end
@@ -116,9 +120,8 @@ module DRbQS
     # @param [Numeric] interval_time An argument of Kernel#sleep.
     def waitall(interval_time)
       while calculating?
-        unless step
-          Kernel.sleep(interval_time)
-        end
+        step
+        Kernel.sleep(interval_time)
       end
     end
 

data/lib/drbqs/worker/worker_process_set.rb

@@ -4,7 +4,7 @@ require 'drbqs/utility/temporary.rb'
 
 module DRbQS
   class Worker
-    READ_BYTE_SIZE = 1024
+    READ_BYTE_SIZE = 10240
 
     class ProcessSet
       attr_reader :process
@@ -140,7 +140,7 @@ module DRbQS
       private :delete_process
 
       # Read IOs and respond signals from chiled processes.
-      # If there no signal from childe processes then the method returns false.
+      # If there is no data from child processes then the method returns false.
       # Otherwise, true.
       # Types of signals are :result, :node_error, :finish_preparing_to_exit.
       #  - :result
@@ -154,10 +154,16 @@ module DRbQS
         to_be_deleted = []
         @process.each do |key, h|
           if !h[:task].empty? || h[:exit]
+            data = ''
             begin
-              data = h[:in].read_nonblock(READ_BYTE_SIZE)
+              loop do
+                data << h[:in].read_nonblock(READ_BYTE_SIZE)
+              end
+            rescue IO::WaitReadable
+            end
+            if !data.empty?
+              num += 1
               h[:unpacker].feed_each(data) do |ary|
-                num += 1
                 response_type, response = ary
                 case response_type
                 when :result
@@ -179,7 +185,6 @@ module DRbQS
                   to_be_deleted << key
                 end
               end
-            rescue IO::WaitReadable
             end
           end
         end

data/spec/integration_test/01_basic_usage_spec.rb

@@ -9,7 +9,7 @@ describe DRbQS do
       DRbQS::Task.new(TestCount.new, :echo, args: [i])
     end
     @process_id, @uri = drbqs_fork_server(14010, :task => @tasks)
-    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true)
+    @node = DRbQS::Node.new(@uri, :log_file => $stdout)
   end
 
   it "should have nil instance variables" do

data/spec/integration_test/02_use_generator_spec.rb

@@ -14,7 +14,7 @@ describe DRbQS do
       end
     end
     @process_id, @uri = drbqs_fork_server(14020, :task => @task_generators)
-    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true)
+    @node = DRbQS::Node.new(@uri, :log_file => $stdout)
   end
 
   it "should have nil instance variables" do

data/spec/integration_test/03_use_temporary_file_spec.rb

@@ -7,7 +7,7 @@ describe DRbQS do
   before(:all) do
     @tasks = [DRbQS::Task.new(Test3.new, :temp_file)]
     @process_id, @uri = drbqs_fork_server(14030, :task => @tasks)
-    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true)
+    @node = DRbQS::Node.new(@uri, :log_file => $stdout)
   end
 
   it "should initialize @task_client" do

data/spec/integration_test/04_use_unix_domain_spec.rb

@@ -11,7 +11,7 @@ describe DRbQS::Server do
     path = "/tmp/drbqs"
     @process_id, @uri = drbqs_fork_server(path, :task => @tasks)
     @manage = DRbQS::Manage.new(:uri => @uri)
-    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true)
+    @node = DRbQS::Node.new(@uri, :log_file => $stdout)
   end
 
   it "should send signal and get status" do

data/spec/integration_test/11_special_tasks_spec.rb

@@ -36,7 +36,7 @@ describe DRbQS do
       server.set_finalization_task(DRbQS::Task.new(TestValue, :set, args: [:third, 3]),
                                    DRbQS::Task.new(TestValue, :set, args: [:fourth, 4]))
     end
-    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true)
+    @node = DRbQS::Node.new(@uri, :log_file => $stdout)
   end
 
   it "should execute initialization tasks." do

data/spec/integration_test/12_multiple_workers_spec.rb

@@ -13,7 +13,7 @@ describe DRbQS do
     end
     @process_number = 3
     @process_id, @uri = drbqs_fork_server(14120, :task => @tasks)
-    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true, :process => @process_number)
+    @node = DRbQS::Node.new(@uri, :log_file => $stdout, :process => @process_number)
   end
 
   it "should calculate" do

data/spec/worker/worker_process_set_spec.rb

@@ -65,6 +65,7 @@ describe DRbQS::Worker::ProcessSet do
           subject.respond_signal
           sleep(0.1)
           unless subject.exist?(key)
+            sleep(0.1)
             break
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drbqs
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000 Z
+date: 2011-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10367840 !ruby/object:Gem::Requirement
+  requirement: &12438740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *10367840
+  version_requirements: *12438740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &10366940 !ruby/object:Gem::Requirement
+  requirement: &12438160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *10366940
+  version_requirements: *12438160
 - !ruby/object:Gem::Dependency
   name: filename
-  requirement: &10366320 !ruby/object:Gem::Requirement
+  requirement: &12437700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *10366320
+  version_requirements: *12437700
 - !ruby/object:Gem::Dependency
   name: user_config
-  requirement: &10365760 !ruby/object:Gem::Requirement
+  requirement: &12437200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *10365760
+  version_requirements: *12437200
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &10365160 !ruby/object:Gem::Requirement
+  requirement: &12436460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *10365160
+  version_requirements: *12436460
 - !ruby/object:Gem::Dependency
   name: net-ssh-shell
-  requirement: &10364460 !ruby/object:Gem::Requirement
+  requirement: &12435840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *10364460
+  version_requirements: *12435840
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &10363900 !ruby/object:Gem::Requirement
+  requirement: &12435360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *10363900
+  version_requirements: *12435360
 - !ruby/object:Gem::Dependency
   name: sys-proctable
-  requirement: &10363400 !ruby/object:Gem::Requirement
+  requirement: &12434980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10363400
+  version_requirements: *12434980
 description: Task queuing system over network that is implemented by dRuby.
 email:
 - d@ytak.info