dtr 1.0.0 → 1.1.0

data/lib/dtr/master.rb

@@ -24,7 +24,9 @@ module DTR
       DTR.info {""}
       DTR.info {"--------------------beautiful line--------------------------"}
       DTR.info {"Master process started at #{Time.now}"}
+      DTR.info {"Master heartbeat interval: #{DTR.configuration.master_heartbeat_interval}"}
 
+      DTR.root = Dir.pwd
       DTR.configuration.with_rinda_server do
         provide_working_env WorkingEnv.new
         with_wakeup_agents(&block)

data/lib/dtr/monitor.rb

@@ -23,7 +23,7 @@ module DTR
       include Adapter::Master
 
       def start
-        DTR.fork_process do
+        Process.fork do
           monitor
         end
       end
@@ -44,7 +44,7 @@ module DTR
       include Service::Agent
 
       def start
-        DTR.fork_process do
+        Process.fork do
           begin
             loop do
               monitor

data/lib/dtr/raketasks.rb

@@ -18,6 +18,7 @@ require 'rake/testtask'
 require 'rake/tasklib'
 
 require 'dtr'
+require 'dtr/shared/root'
 require 'dtr/shared/ruby_ext'
 require 'dtr/shared/utils'
 require 'dtr/shared/sync_codebase/package'
@@ -85,23 +86,17 @@ module DTR
 
       desc "Run tests with DTR injected"
       task @name do
-        @agent = start_agent
+        start_agent
         run_code = ''
-        begin
-          RakeFileUtils.verbose(@verbose) do
-            run_code = rake_loader
-            @ruby_opts.unshift( "-I#{lib_path}" )
-            @ruby_opts.unshift( "-w" ) if @warning
-            
-            ruby @ruby_opts.join(" ") +
-              " \"#{run_code}\" " +
-              file_list.unshift('dtr/test_unit_injection.rb').collect { |fn| "\"#{fn}\"" }.join(' ') +
-              " #{option_list}"
-          end
-        ensure
-          if defined?(@agent)
-            DTR.kill_process @agent
-          end
+        RakeFileUtils.verbose(@verbose) do
+          run_code = rake_loader
+          @ruby_opts.unshift( "-I#{lib_path}" )
+          @ruby_opts.unshift( "-w" ) if @warning
+          
+          ruby @ruby_opts.join(" ") +
+            " \"#{run_code}\" " +
+            file_list.unshift('dtr/test_unit_injection.rb').collect { |fn| "\"#{fn}\"" }.join(' ') +
+            " #{option_list}"
         end
       end
       self
@@ -113,9 +108,9 @@ module DTR
       runner_names = []
       self.processes.to_i.times {|i| runner_names << "runner#{i}"}
       
-      DTR.fork_process do
-        DTR_AGENT_OPTIONS[:runners] = runner_names if DTR_AGENT_OPTIONS[:runners].empty?
-        DTR.start_agent
+      DTR.agent_runners = runner_names if DTR.agent_runners.blank?
+      Thread.start do
+        DTR.run_script('DTR::Agent.start(:hypnotize_once)')
       end
     end
   end

data/lib/dtr/shared.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'fileutils'
+require 'dtr/shared/root'
 require 'dtr/shared/ruby_ext'
 require 'dtr/shared/utils'
 require 'dtr/shared/message_decorator'

data/lib/dtr/shared/adapter.rb

@@ -12,104 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'timeout'
-
-module DTR
-  module Adapter
-    WAKEUP_MESSAGE = 'wakeup'
-    SLEEP_MESSAGE = 'sleep'
-
-    module Follower
-      def wakeup?
-        msg, host, group = listen
-        if group == DTR.configuration.group && msg == Adapter::WAKEUP_MESSAGE
-          ip, port = host.split(':')
-          DTR.configuration.rinda_server_port = port.to_i
-          DTR.configuration.broadcast_list = [ip]
-          @wakeup_for_host = host
-          true
-        end
-      end
-
-      def sleep?
-        return true unless defined?(@wakeup_for_host)
-        Timeout.timeout(DTR.configuration.follower_listen_heartbeat_timeout) do
-          until (msg, host = listen) && host == @wakeup_for_host; end
-          msg == Adapter::SLEEP_MESSAGE
-        end
-      rescue Timeout::Error => e
-        DTR.info {"Timeout while listening command"}
-        true
-      end
-
-      def relax
-        if defined?(@soc) && @soc
-          @soc.close rescue nil
-        end
-      end
-
-      private
-      def listen
-        unless defined?(@soc)
-          @soc = UDPSocket.open
-          @soc.bind('', DTR.configuration.agent_listen_port)
-          DTR.info("DTR Agent is listening on port #{DTR.configuration.agent_listen_port}")
-        end
-        message, client_address = @soc.recvfrom(400)
-        cmd, port, group = message.split
-
-        hostname = client_address[2]
-        host_ip = client_address[3]
-        DTR.info {"Received: #{cmd} for group #{group} from #{hostname}(#{host_ip}):#{port}"}
-        [cmd, "#{host_ip}:#{port}", group]
-      end
-    end
-
-    module Master
-      def hypnotize_agents
-        yell_agents("#{Adapter::SLEEP_MESSAGE} #{DTR.configuration.rinda_server_port}")
-      end
-
-      def with_wakeup_agents(&block)
-        heartbeat = Thread.new do
-          loop do
-            do_wakeup_agents
-            sleep(DTR.configuration.master_heartbeat_interval)
-          end
-        end
-        #heartbeat thread should have high priority for agent is listening
-        heartbeat.priority = Thread.current.priority + 10
-        block.call
-      ensure
-        #kill heartbeat first, so that agents wouldn't be wakeup after hypnotized
-        Thread.kill heartbeat rescue nil
-        hypnotize_agents rescue nil
-      end
-
-      def do_wakeup_agents
-        yell_agents("#{Adapter::WAKEUP_MESSAGE} #{DTR.configuration.rinda_server_port} #{DTR.configuration.group}")
-      end
-
-      private
-      def yell_agents(msg)
-        DTR.info {"yell agents #{msg}: #{DTR.configuration.broadcast_list.inspect}"}
-        DTR.configuration.broadcast_list.each do |it|
-          broadcast(it, msg)
-        end
-      end
-
-      def broadcast(it, msg)
-        soc = UDPSocket.open
-        begin
-          soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
-          DTR.debug {"broadcast sending #{msg} to #{it}"}
-          soc.send(msg, 0, it, DTR.configuration.agent_listen_port)
-        rescue
-          nil
-        ensure
-          soc.close
-        end
-      end
-    end
-  end
-end
+require 'dtr/shared/adapter/base'
+require 'dtr/shared/adapter/mortality'

data/lib/dtr/shared/adapter/base.rb

@@ -0,0 +1,118 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'timeout'
+
+module DTR
+  module Adapter
+    WAKEUP_MESSAGE = 'wakeup'
+    SLEEP_MESSAGE = 'sleep'
+
+    module Follower
+      def wakeup?
+        msg, host, group = listen
+        if group == DTR.configuration.group && msg == Adapter::WAKEUP_MESSAGE
+          ip, port = host.split(':')
+          DTR.configuration.rinda_server_port = port.to_i
+          DTR.configuration.broadcast_list = [ip]
+          DTR.configuration.save
+          DTR.info {"=> Rinda server port: #{DTR.configuration.rinda_server_port}"}
+          DTR.info {"=> Broadcast list: #{DTR.configuration.broadcast_list.inspect}"}
+          @wakeup_for_host = host
+          true
+        end
+      end
+
+      def sleep?
+        return true unless defined?(@wakeup_for_host)
+        Timeout.timeout(DTR.configuration.follower_listen_heartbeat_timeout) do
+          until (msg, host = listen) && host == @wakeup_for_host; end
+          msg == Adapter::SLEEP_MESSAGE
+        end
+      rescue Timeout::Error => e
+        DTR.info {"Timeout while listening command"}
+        true
+      end
+
+      def relax
+        if defined?(@soc) && @soc
+          @soc.close rescue nil
+        end
+      end
+
+      private
+      def listen
+        unless defined?(@soc)
+          @soc = UDPSocket.open
+          @soc.bind('', DTR.configuration.agent_listen_port)
+          DTR.info("DTR Agent is listening on port #{DTR.configuration.agent_listen_port}")
+        end
+        message, client_address = @soc.recvfrom(400)
+        cmd, port, group = message.split
+
+        hostname = client_address[2]
+        host_ip = client_address[3]
+        DTR.info {"Received: #{cmd} for group #{group} from #{hostname}(#{host_ip}):#{port}"}
+        [cmd, "#{host_ip}:#{port}", group]
+      end
+    end
+
+    module Master
+      def hypnotize_agents
+        yell_agents("#{Adapter::SLEEP_MESSAGE} #{DTR.configuration.rinda_server_port}")
+      end
+
+      def with_wakeup_agents(&block)
+        heartbeat = Thread.new do
+          loop do
+            do_wakeup_agents
+            sleep(DTR.configuration.master_heartbeat_interval)
+          end
+        end
+        #heartbeat thread should have high priority for agent is listening
+        heartbeat.priority = Thread.current.priority + 10
+        block.call
+      ensure
+        #kill heartbeat first, so that agents wouldn't be wakeup after hypnotized
+        Thread.kill heartbeat rescue nil
+        hypnotize_agents rescue nil
+      end
+
+      def do_wakeup_agents
+        yell_agents("#{Adapter::WAKEUP_MESSAGE} #{DTR.configuration.rinda_server_port} #{DTR.configuration.group}")
+      end
+
+      private
+      def yell_agents(msg)
+        DTR.info {"yell agents #{msg}: #{DTR.configuration.broadcast_list.inspect}"}
+        DTR.configuration.broadcast_list.each do |it|
+          broadcast(it, msg)
+        end
+      end
+
+      def broadcast(it, msg)
+        soc = UDPSocket.open
+        begin
+          soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+          DTR.debug {"broadcast sending #{msg} to #{it}"}
+          soc.send(msg, 0, it, DTR.configuration.agent_listen_port)
+        rescue
+          nil
+        ensure
+          soc.close
+        end
+      end
+    end
+  end
+end

data/lib/dtr/shared/adapter/mortality.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'timeout'
+
+module DTR
+  module Adapter
+    DEAD_MESSAGE = 'die'
+
+    module Follower
+      private
+
+      def listen_with_dead_message
+        cmd, host, group = listen_without_dead_message
+        if cmd == Adapter::DEAD_MESSAGE && group == DTR.configuration.group
+          DTR.info{"Master need me die. So I am dieing."}
+          raise Interrupt, "Master need me die."
+        end
+        [cmd, host, group]
+      end
+      alias_method_chain :listen, :dead_message
+    end
+
+    module Master
+      def group_agents_should_die(group = DTR.configuration.group)
+        yell_agents("#{Adapter::DEAD_MESSAGE} #{DTR.configuration.rinda_server_port} #{group}")
+      end
+    end
+  end
+end

data/lib/dtr/shared/configuration.rb

@@ -41,32 +41,50 @@ module DTR
     include Singleton
     include Service::Rinda
 
-    attr_accessor :broadcast_list, :rinda_server_port, :agent_listen_port, :master_heartbeat_interval, :follower_listen_heartbeat_timeout
+    attr_accessor :broadcast_list, :rinda_server_port, :agent_listen_port, :master_heartbeat_interval, :follower_listen_heartbeat_timeout, :agent_env_setup_cmd, :agent_runners
     attr_reader :group
 
     def initialize
+      @store = EnvStore.new
+      load
+    end
+
+    def refresh
+      @store.destroy if @store
+      @store = EnvStore.new
       load
     end
 
     def load
-      store = EnvStore.new
       # always have 'localhost' in broadcast_list, for our master process would start rinda server locally,
       # and dtr should work well on local machine when the machine leaves dtr grid network environment.
-      @broadcast_list = ['localhost'].concat(store[:broadcast_list] || []).uniq
-      @rinda_server_port = 3344
-      @agent_listen_port = store[:agent_listen_port] || 7788
-      @master_heartbeat_interval = store[:master_heartbeat_interval] || 10
-      @follower_listen_heartbeat_timeout =  store[:follower_listen_heartbeat_timeout] || 15
-      @group = store[:group]
+      @broadcast_list = ['localhost'].concat(@store[:broadcast_list] || []).uniq
+      @rinda_server_port = @store[:rinda_server_port] || 3344
+      @agent_listen_port = @store[:agent_listen_port] || 7788
+      @master_heartbeat_interval = @store[:master_heartbeat_interval] || 10
+      @follower_listen_heartbeat_timeout =  @store[:follower_listen_heartbeat_timeout] || 15
+      @group = @store[:group]
+      @agent_env_setup_cmd = @store[:agent_env_setup_cmd]
+      @agent_runners = @store[:agent_runners]
     end
 
     def save
-      store = EnvStore.new
-      store[:broadcast_list] = @broadcast_list
-      store[:agent_listen_port] = @agent_listen_port
-      store[:master_heartbeat_interval] = @master_heartbeat_interval
-      store[:follower_listen_heartbeat_timeout] = @follower_listen_heartbeat_timeout
-      store[:group] = @group
+      @store[:broadcast_list] = @broadcast_list
+      @store[:rinda_server_port] = @rinda_server_port
+      @store[:agent_listen_port] = @agent_listen_port
+      @store[:master_heartbeat_interval] = @master_heartbeat_interval
+      @store[:follower_listen_heartbeat_timeout] = @follower_listen_heartbeat_timeout
+      @store[:group] = @group
+      @store[:agent_env_setup_cmd] = @agent_env_setup_cmd
+      @store[:agent_runners] = @agent_runners
+    end
+
+    def working_env
+      @store[:working_env]
+    end
+
+    def working_env=(env)
+      @store[:working_env] = env
     end
 
     def group=(group)

data/lib/dtr/shared/root.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module DTR
+  module Root
+    attr_accessor :root
+  end
+  extend Root
+end

data/lib/dtr/shared/sync_codebase/master_ext.rb

@@ -26,12 +26,12 @@ module DTR
       def with_dtr_master_with_sync_codebase(&block)
         with_dtr_master_without_sync_codebase do
           DTR.do_println("Packaging codebase")
-          raise 'Packaging for dtr task failed, see log for details!' unless Cmd.execute('rake dtr_repackage --trace')
+          raise 'Packaging for dtr task failed, see log for details!' unless Cmd.execute('rake --trace dtr_repackage')
           begin
             provide_file CopiablePackage.new
             block.call
           ensure
-            Cmd.execute('rake dtr_clobber_package --trace')
+            Cmd.execute('rake --trace dtr_clobber_package')
           end
         end
       end