xli-dtr 0.0.5 → 1.0.0

data/lib/dtr/agent/herald.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -16,6 +16,9 @@ module DTR
 
   module Agent
     class Herald
+      class WorkingEnvError < StandardError
+      end
+
       include Service::WorkingEnv
       include Service::Agent
 
@@ -24,26 +27,33 @@ module DTR
         @agent_env_setup_cmd = agent_env_setup_cmd
         @runners = runners
         @env_store = EnvStore.new
+        start_service
         start_off
+      ensure
+        stop_service
       end
 
       def start_off
-        start_service
-        DTR.info "=> Herald starts off..."
+        DTR.info {"=> Herald starts off..."}
         provide_agent_info(@agent_env_setup_cmd, @runners)
 
+        @env_store[@working_env_key] = fetch_working_env
+      rescue WorkingEnvError
+        DTR.error $!.message
+        exit(-1)
+      rescue
+        DTR.error $!.message
+        DTR.error $!.backtrace.join("\n")
+        exit(-1)
+      end
+
+      def fetch_working_env
         working_env = lookup_working_env
-        DTR.info "=> Got working environment created at #{working_env[:created_at]} by #{working_env[:host]}"
-        if working_env[:files].blank?
-          DTR.error "No test files need to load?(working env: #{working_env})"
-          return
-        end
-
-        if working_env.setup_env(@agent_env_setup_cmd)
-          @env_store[@working_env_key] = working_env
-        else
-          DTR.info {'Setup working environment failed, no runner started.'}
-        end
+        DTR.info {"=> Got working environment created at #{working_env[:created_at]} by #{working_env[:host]}"}
+
+        raise WorkingEnvError.new("No test files need to load?(working env: #{working_env})") if working_env[:files].blank?
+        raise WorkingEnvError.new('Setup working environment failed, no runner started.') unless working_env.setup_env(@agent_env_setup_cmd)
+        working_env
       end
     end
   end

data/lib/dtr/agent/runner.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -20,7 +20,6 @@ module DTR
 
       def self.start(name, env)
         self.new(name, env).start
-        DTR.info "=> Runner #{name} provided"
         DRb.thread.join if DRb.thread
       end
 
@@ -30,8 +29,6 @@ module DTR
         @name = name
         @identifier = env[:identifier]
         @env = env
-        @started = 0
-        @run_finished = 0
       end
       
       def start
@@ -39,59 +36,49 @@ module DTR
         start_service
         DTR.info("=> Starting runner #{name} at #{Dir.pwd}, pid: #{Process.pid}")
         init_environment
-        provide_runner(self)
+        provide
+        DTR.info {"=> Runner #{name} provided"}
+      rescue Exception
+        DTR.error($!.message)
+        DTR.error($!.backtrace.join("\n"))
       end
 
       def init_environment
-        DTR.info "#{name}: Initialize working environment..."
+        DTR.info {"#{name}: Initialize working environment..."}
+        ENV['DTR_RUNNER_NAME'] = name
+
         @env[:libs].select{ |lib| !$LOAD_PATH.include?(lib) && File.exists?(lib) }.each do |lib|
           $LOAD_PATH << lib
-          DTR.debug "#{name}: appended lib: #{lib}"
+          DTR.debug {"#{name}: appended lib: #{lib}"}
         end
-        DTR.info "#{name}: libs loaded"
-        DTR.debug "#{name}: $LOAD_PATH: #{$LOAD_PATH.inspect}"
+        DTR.info {"#{name}: libs loaded"}
+        DTR.debug {"#{name}: $LOAD_PATH: #{$LOAD_PATH.inspect}"}
 
         @env[:files].each do |f|
           begin
             load f unless f =~ /^-/
-            DTR.debug "#{name}: loaded #{f}"
+            DTR.debug {"#{name}: loaded #{f}"}
           rescue LoadError => e
-            DTR.error "#{name}: No such file to load -- #{f}"
-            DTR.debug "Environment: #{@env}"
+            DTR.error {"#{name}: No such file to load -- #{f}"}
+            DTR.debug {"Environment: #{@env}"}
           end
         end
-        DTR.info "#{name}: test files loaded"
+        DTR.info {"#{name}: test files loaded"}
       end
 
       def run(test, result, &progress_block)
-        DTR.info "#{name}: +"
-        DTR.debug "#{name}: running #{test}..."
-        @started += 1
-        test.run(result, &progress_block)
-      rescue DRb::DRbConnError => e
-        DTR.info "Rescued DRb::DRbConnError(#{e.message}), while running test: #{test.name}. The master process may be stopped."
-      rescue Exception => e
-        DTR.error "Unexpected exception: #{e.message}"
-        DTR.error e.backtrace.join("\n")
-        result.add_error(Test::Unit::Error.new(test.name, e))
-        result.add_run
-        progress_block.call(Test::Unit::TestCase::FINISHED, test.name)
+        DTR.debug {"#{name}: running #{test}..."}
+        Agent::TestCase.new(test, result, &progress_block).run
+        DTR.debug {"#{name}: done #{test}"}
       ensure
-        DTR.debug "#{name}: done #{test}"
-        @run_finished += 1
-        provide_runner(self)
+        provide
+        DTR.debug {"=> Runner #{name} provided"}
       end
 
-      def reboot
-        DTR.info "#{self} is rebooting. Ran #{@started} tests, finished #{@run_finished}."
+      def provide
         provide_runner(self)
       end
 
-      def shutdown
-        DTR.info "#{self} is shutting down. Ran #{@started} tests, finished #{@run_finished}."
-        stop_service rescue exit!
-      end
-
       def to_s
         "Runner #{@name}"
       end

data/lib/dtr/agent/sync_codebase.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.

data/lib/dtr/agent/sync_logger.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -15,12 +15,12 @@
 module DTR
   module SyncLogger
 
-    # Synchronizer loads SyncLogger from master process
-    # Any process need sync logs with master process should start service first.
-    # For logs would be sent back to master process, output log code should use 
-    # message string instead of block, for example: 
-    #    right: DTR.debug 'message'
-    #    not:   DTR.debug { 'message' }
+    # Synchronizer loads SyncLogger provided by master process from Rinda server.
+    # Any process need sync logs with master process should start service first,
+    # so that local logger could be replaced by SyncLogger.
+    # For logs would be sent back to master process, all messages would be sent
+    # as string message. The message logged as block would be converted to string
+    # message.
     module Synchronizer
       def self.included(base)
         base.alias_method_chain :start_service, :sync_logger
@@ -30,10 +30,40 @@ module DTR
         start_service_without_sync_logger
         if logger_tuple = lookup_ring.read_all([:logger, nil]).first
           sync_logger = logger_tuple[1]
-          DTR.logger = sync_logger
+          DTR.logger = MessageDecoratedLogger.new(sync_logger)
         end
       end
     end
+
+    class MessageDecoratedLogger
+      include MessageDecorator
+
+      def initialize(logger)
+        @logger = logger
+      end
+
+      def debug(message=nil, &block)
+        with_decorating_message(:debug, message, &block)
+      end
+
+      def info(message=nil, &block)
+        with_decorating_message(:info, message, &block)
+      end
+
+      def error(message=nil, &block)
+        with_decorating_message(:error, message, &block)
+      end
+
+      def level
+        @logger_level ||= @logger.level
+      end
+
+      private
+      def with_decorating_message(level, msg, &block)
+        raise 'Should not use block to send log remotely' if block_given?
+        @logger.send(level, decorate_message(msg))
+      end
+    end
   end
 
   Service::Rinda.send(:include, SyncLogger::Synchronizer)

data/lib/dtr/agent/test_case.rb

@@ -0,0 +1,53 @@
+# 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 Agent
+    class UnknownTestError < StandardError
+    end
+    class TestCase
+      def initialize(test, result, &progress_block)
+        @test = test
+        @result = result
+        @progress_block = progress_block
+      end
+
+      def run
+        if @test.is_a?(DRb::DRbUnknown)
+          add_error(UnknownTestError.new("No such test loaded: #{@test.name}"))
+        else
+          @test.run(@result, &@progress_block)
+        end
+      rescue DRb::DRbConnError => e
+        msg = "Rescued DRb::DRbConnError(#{e.message}), while running test: #{test}. The master process may be stopped."
+        DTR.do_println(msg)
+        DTR.info {msg}
+      rescue Exception => e
+        unexpected_error(e)
+      end
+
+      def unexpected_error(e)
+        DTR.error "Unexpected exception: #{e.message}"
+        DTR.error e.backtrace.join("\n")
+        add_error(e)
+      end
+
+      def add_error(e)
+        @result.add_error(Test::Unit::Error.new(@test.name, RemoteError.new(e)))
+        @result.add_run
+        @progress_block.call(Test::Unit::TestCase::FINISHED, @test.name)
+      end
+    end
+  end
+end

data/lib/dtr/agent/test_unit.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -35,8 +35,6 @@ module DTR
   end
 end
 
+# set run to true first, so that test auto runner wouldn't work
 Test::Unit.run = true
-
-class Test::Unit::TestCase
-  include DTR::Agent::TestCaseExt
-end
+Test::Unit::TestCase.send(:include, DTR::Agent::TestCaseExt)

data/lib/dtr/agent/worker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -15,6 +15,8 @@
 module DTR
 
   module Agent
+    # Worker works during one dtr test task running.
+    # Worker manages Herald & Runner processes life cycle.
     class Worker
       def initialize(runner_names, agent_env_setup_cmd)
         @runner_names = runner_names.is_a?(Array) ? runner_names : [runner_names.to_s]
@@ -26,13 +28,13 @@ module DTR
       end
 
       def launch
-        DTR.info "=> Agent worker started at: #{Dir.pwd}, pid: #{Process.pid}"
+        DTR.info {"=> Agent worker started at: #{Dir.pwd}, pid: #{Process.pid}"}
         setup
         begin
           run
         ensure
           teardown
-          DTR.info "Agent worker is dieing"
+          DTR.info {"Agent worker is dieing"}
         end
       end
 
@@ -42,50 +44,45 @@ module DTR
       end
 
       def teardown
-        kill_all_runners
+        unless @runner_pids.blank?
+          @runner_pids.each{ |pid| DTR.kill_process pid }
+          DTR.info {"=> All runners(#{@runner_pids.join(", ")}) were killed." }
+          @runner_pids = []
+        end
         if @herald
-          Process.kill 'TERM', @herald rescue nil
+          DTR.kill_process @herald
           @herald = nil
-          DTR.info "=> Herald is killed."
+          DTR.info {"=> Herald is killed."}
         end
       end
 
       def run
-        @herald = drb_fork { Herald.new @working_env_key, @agent_env_setup_cmd, @runner_names }
-        while @env_store[@working_env_key].nil?
-          sleep(1)
-        end
+        herald
+        runners
+        DTR.info {"=> All agent worker sub processes exited."}
+      end
+
+      def herald
+        @herald = DTR.fork_process { Herald.new @working_env_key, @agent_env_setup_cmd, @runner_names }
+        Process.waitpid @herald
+        exit(-1) unless $?.exitstatus == 0
+      end
+
+      def runners
         working_env = @env_store[@working_env_key]
 
         @runner_names.each do |name|
-          @runner_pids << drb_fork {
+          @runner_pids << DTR.fork_process {
+            at_exit {
+              # exit anyway, for DRb may hang on the process to be a deadwalk
+              exit!
+            }
             working_env.within do
               Runner.start name, working_env
             end
           }
         end
         Process.waitall
-        DTR.info "=> All agent worker sub processes exited."
-      end
-
-      def kill_all_runners
-        unless @runner_pids.blank?
-          @runner_pids.each{ |pid| Process.kill 'TERM', pid rescue nil }
-          DTR.info "=> All runners(#{@runner_pids.join(", ")}) were killed." 
-          @runner_pids = []
-        end
-      end
-
-      def drb_fork
-        Process.fork do
-          begin
-            yield
-          rescue Interrupt, SystemExit, SignalException
-          rescue Exception => e
-            DTR.error "Worker drb fork is stopped by Exception => #{e.class.name}, message => #{e.message}"
-            DTR.info e.backtrace.join("\n")
-          end
-        end
       end
     end
   end

data/lib/dtr/agent/working_env_ext.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -14,6 +14,7 @@
 
 module DTR
   module Agent
+    # Provides working environment setup beheaviours for Herald & Runner process
     module WorkingEnvExt
       def within
         ENV['DTR_MASTER_ENV'] = self[:dtr_master_env]
@@ -35,7 +36,8 @@ module DTR
 
       def working_dir
         return @working_dir if defined?(@working_dir)
-        project_name = self[:pwd].length > 20 ? self[:pwd][-20..-1] : self[:pwd]
+        project_specific_len = 20
+        project_name = self[:pwd].length > project_specific_len ? self[:pwd][-project_specific_len..-1] : self[:pwd]
         @working_dir = File.join(escape(self[:host]), escape(project_name))
         FileUtils.mkdir_p(@working_dir)
         @working_dir

data/lib/dtr/agent.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -21,6 +21,7 @@ require 'dtr/agent/brain'
 require 'dtr/agent/worker'
 require 'dtr/agent/test_unit'
 require 'dtr/agent/herald'
+require 'dtr/agent/test_case'
 require 'dtr/agent/runner'
 
 module DTR

data/lib/dtr/facade.rb

@@ -0,0 +1,65 @@
+# 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 Facade
+    def start_agent
+      launch_agent(DTR_AGENT_OPTIONS[:runners], DTR_AGENT_OPTIONS[:agent_env_setup_cmd])
+    end
+
+    def launch_agent(names, setup=nil)
+      require 'dtr/agent'
+      names = names || "DTR(#{Time.now})"
+      DTR::Agent.start(names, setup)
+    end
+
+    def lib_path
+      File.expand_path(File.dirname(__FILE__) + '/../')
+    end
+
+    def broadcast_list=(list)
+      require 'dtr/shared'
+      DTR.configuration.broadcast_list = list
+      DTR.configuration.save
+    end
+
+    def agent_listen_port=(port)
+      require 'dtr/shared'
+      DTR.configuration.agent_listen_port = port
+      DTR.configuration.save
+    end
+
+    def group=(group)
+      require 'dtr/shared'
+      DTR.configuration.group = group
+      DTR.configuration.save
+    end
+
+    def monitor
+      require 'dtr/monitor'
+      DTR.logger('dtr_monitor.log')
+      Monitor.new.start
+    end
+
+    # For safe fork & kill sub process, should use Process.kill and Process.fork
+    # At least have problem on ruby 1.8.6 114 with Kernel#kill & fork
+    def kill_process(pid)
+      Process.kill 'TERM', pid rescue nil
+    end
+
+    def fork_process(&block)
+      Process.fork(&block)
+    end
+  end
+end

data/lib/dtr/master.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -21,8 +21,8 @@ module DTR
         ActiveRecord::Base.clear_active_connections! rescue nil
       end
 
-      DTR.info ""
-      DTR.info "--------------------beautiful line--------------------------"
+      DTR.info {""}
+      DTR.info {"--------------------beautiful line--------------------------"}
       DTR.info {"Master process started at #{Time.now}"}
 
       DTR.configuration.with_rinda_server do

data/lib/dtr/monitor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# 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.
@@ -15,23 +15,81 @@
 require 'dtr/master'
 
 module DTR
+  
+  # Monitor provides a way to monitor agent/master process working status.
   class Monitor
-    include Adapter::Master
-    include Service::Agent
-    def start
-      DTR.configuration.with_rinda_server do
-        monitor_thread = Thread.new do
-          new_agent_monitor.each { |t| puts t.last.last }
+
+    class AgentsMonitor
+      include Adapter::Master
+
+      def start
+        DTR.fork_process do
+          monitor
+        end
+      end
+      def monitor
+        DTR.configuration.with_rinda_server do
+          with_wakeup_agents do
+            begin
+              sleep
+            rescue Interrupt
+            end
+          end
         end
-        puts "Monitor process started at #{Time.now}"
-      
-        with_wakeup_agents do
+      end
+    end
+
+    class MasterMonitor
+      include Adapter::Follower
+      include Service::Agent
+
+      def start
+        DTR.fork_process do
           begin
-            monitor_thread.join
+            loop do
+              monitor
+            end
+          rescue Errno::EADDRINUSE
+            puts "There is DTR agent started on this machine."
+            puts "Shutdown it for monitoring working DTR Master info."
           rescue Interrupt
+          ensure
+            relax
           end
         end
       end
+
+      def monitor
+        msg, from_host, group = listen
+        unless ["127.0.0.1:#{DTR.configuration.rinda_server_port}"].include?(from_host)
+          puts "Master process message from #{from_host}: #{msg} for group #{group}"
+          ip, port = from_host.split(':')
+          with_configuration(ip, port) do
+            start_service
+            puts "Agents working for #{from_host}: "
+            puts all_agents_info.collect{|i| "  #{i.strip}"}.join("\n")
+          end
+        end
+      end
+
+      def with_configuration(ip, port)
+        my_port = DTR.configuration.rinda_server_port
+        my_broadcast_list = DTR.configuration.broadcast_list
+        DTR.configuration.rinda_server_port = port.to_i
+        DTR.configuration.broadcast_list = [ip]
+        yield
+      ensure
+        DTR.configuration.broadcast_list = my_broadcast_list
+        DTR.configuration.rinda_server_port = my_port
+      end
+    end
+
+    def start
+      MasterMonitor.new.start
+      AgentsMonitor.new.start
+      puts "Monitor process started at #{Time.now}"
+      Process.waitall
+    rescue Interrupt
     end
   end
 end