isono 0.2.1 → 0.2.2

data/isono.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{isono}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = %q{2011-05-27}
+  s.date = %q{2011-06-02}
   s.default_executable = %q{cli}
   s.email = ["dev@axsh.net", "m-fujiwara@axsh.net"]
   s.executables = ["cli"]

data/lib/isono/logger.rb

@@ -11,7 +11,7 @@ module Isono
     def self.initialize(l4r_output=Log4r::StdoutOutputter.new('stdout'))
       # Isono top level logger
       formatter = Log4r::PatternFormatter.new(:depth => 9999, # stack trace depth
-                                              :pattern => "%d %c [%l]: %M",
+                                              :pattern => "%d %c thr=%h [%l]: %M",
                                               :date_format => "%Y/%m/%d %H:%M:%S"
                                               )
       l4r_output.formatter = formatter

data/lib/isono/node_modules/data_store.rb

@@ -10,6 +10,22 @@ module Isono
       config_section do
         desc "Destination database server to be connected."
         database_dsn ''
+
+        desc "Block for create new connection and its setup."
+        connection_block proc { |myself|
+          next if Sequel::DATABASES.first
+          
+          db = Sequel.connect(myself.config_section.database_dsn)
+          DataStore.logger.info("connected to the database: #{myself.config_section.database_dsn}, #{db}")
+        }
+
+        desc "Block for disconnect DB connections"
+        disconnection_block proc { |myself|
+          Sequel::DATABASES.each { |v|
+            v.disconnect
+            DataStore.logger.info("disconnected database connection: #{v}")
+          }
+        }
       end
 
 
@@ -19,7 +35,8 @@ module Isono
 
       def self.pass(&blk)
         @instance.db_writer_thread.pass {
-          @instance.db.transaction {
+          @instance.establish_connection
+          Sequel::DATABASES.first.transaction {
             blk.call
           }
         }
@@ -27,29 +44,27 @@ module Isono
 
       def self.barrier(&blk)
         @instance.db_writer_thread.barrier {
-          @instance.db.transaction {
+          @instance.establish_connection
+          Sequel::DATABASES.first.transaction {
             blk.call
           }
         }
       end
 
-      attr_reader :db_writer_thread, :db
+      attr_reader :db_writer_thread
 
       initialize_hook do
-        @db_writer_thread = ThreadPool.new(1)
-
-        @db_writer_thread.barrier {
-          #@db = Sequel.connect(config_section.database_dsn, {:logger=>logger})
-          @db = Sequel.connect(config_section.database_dsn)
-          logger.debug("connected to the database: #{config_section.database_dsn}, #{@db}")
-        }
-
+        @db_writer_thread = ThreadPool.new(1, 'DataStore')
         DataStore.create_instance(node)
       end
       
       terminate_hook do
         @db_writer_thread.shutdown
-        @db.disconnect
+        config_section.disconnection_block.call(myinstance)
+      end
+
+      def establish_connection
+        config_section.connection_block.call(self)
       end
 
     end

data/lib/isono/node_modules/job_worker.rb

@@ -10,11 +10,12 @@ module Isono
       JOB_CTX_KEY=:job_worker_ctx
 
       config_section do |c|
+        desc "Concurrency number of worker thread."
         c.concurrency = 1
       end
       
       initialize_hook do
-        @thread_pool = ThreadPool.new(config_section.concurrency.to_i)
+        @thread_pool = ThreadPool.new(config_section.concurrency.to_i, 'JobWorker')
         @active_jobs = {}
 
         RpcChannel.new(node).register_endpoint("job-stats.#{node.node_id}", proc { |req, res|

data/lib/isono/thread_pool.rb

@@ -8,37 +8,48 @@ module Isono
     class WorkerTerminateError < StandardError; end
     class TimeoutError < StandardError; end
 
-    attr_reader :queue
+    attr_reader :queue, :name
     
     def initialize(worker_num=1, name=nil, opts={})
-      set_instance_logger(name)
       @queue = ::Queue.new
       @name = name
       @opts = {:stucked_queue_num=>20}.merge(opts)
       @last_stuck_warn_at = Time.now
       
       @worker_threads = {}
-      worker_num.times {
+      worker_num.times { |wid|
         t = Thread.new {
+          # Log4r::PatternFormatter can refer thread name as %h.
+          Thread.current[:name] = "#{name}[#{wid}/#{worker_num}]" if name
           begin
             while op = @queue.pop
-              if @queue.size > @opts[:stucked_queue_num] && Time.now - @last_stuck_warn_at > 5.0
+              if @queue.size > @opts[:stucked_queue_num] && Time.now - @last_stuck_warn_at > 30.0
                 logger.warn("too many stucked jobs: #{@queue.size}")
                 @last_stuck_warn_at = Time.now
               end
-              
+
+              op_start_at = Time.now
               op.call
+              op_elapsed = Time.now - op_start_at
+              on_task_end(op_start_at, op_elapsed)
             end
           rescue WorkerTerminateError
             # someone indicated to terminate this thread
             # exit from the current loop
             break
-          rescue Exception => e
+          rescue ::Exception => e
             logger.error(e)
+            # worker thread should never die except from the
+            # termination using shutdown() method.
+            # any errors thrown by op.call will be caught here and
+            # back to @queue.pop.
+            retry
           ensure
+            tid = Thread.current.__id__
+            tname = Thread.current[:name] || Thread.current.to_s
             EM.schedule {
-              @worker_threads.delete(Thread.current.__id__)
-              logger.debug("#{Thread.current} is being terminated")
+              @worker_threads.delete(tid)
+              logger.info("Thread #{tname} is being terminated")
             }
           end
           
@@ -168,7 +179,14 @@ module Isono
 
     
     private
-    def thread_loop
+    # This hook allows to log the task took too long time.
+    # 
+    # def on_task_end(op_start_at, op_elapsed)
+    #   if op_elapsed > 10.0
+    #     logger.warn("Task took 10sec")
+    #   end
+    # end
+    def on_task_end(op_start_at, op_elapsed)
     end
      
   end

data/lib/isono/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Isono
-  VERSION='0.2.1'
+  VERSION='0.2.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: isono
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - axsh Ltd.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 +09:00
+date: 2011-06-02 00:00:00 +09:00
 default_executable: cli
 dependencies: 
 - !ruby/object:Gem::Dependency