isono 0.2.12 → 0.2.13

data/isono.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.12"
+  s.version = "0.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = "2012-06-05"
+  s.date = "2012-08-08"
   s.email = ["dev@axsh.net", "m-fujiwara@axsh.net"]
   s.executables = ["cli"]
-  s.files = [".gitignore", "LICENSE", "NOTICE", "Rakefile", "bin/cli", "isono.gemspec", "lib/ext/shellwords.rb", "lib/isono.rb", "lib/isono/amqp_client.rb", "lib/isono/daemonize.rb", "lib/isono/event_delegate_context.rb", "lib/isono/event_observable.rb", "lib/isono/logger.rb", "lib/isono/manifest.rb", "lib/isono/messaging_client.rb", "lib/isono/models/event_log.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/resource_instance.rb", "lib/isono/node.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/rack.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/job.rb", "lib/isono/rack/map.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/resource_manifest.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/serializer.rb", "lib/isono/thread_pool.rb", "lib/isono/util.rb", "lib/isono/version.rb", "spec/amqp_client_spec.rb", "spec/event_observable_spec.rb", "spec/file_channel_spec.rb", "spec/job_channel_spec.rb", "spec/logger_spec.rb", "spec/manifest_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/rpc_channel_spec.rb", "spec/spec_helper.rb", "spec/thread_pool_spec.rb", "spec/util_spec.rb", "tasks/load_resource_manifest.rake"]
+  s.files = [".gitignore", "LICENSE", "NOTICE", "Rakefile", "bin/cli", "isono.gemspec", "lib/ext/shellwords.rb", "lib/isono.rb", "lib/isono/amqp_client.rb", "lib/isono/daemonize.rb", "lib/isono/event_delegate_context.rb", "lib/isono/event_observable.rb", "lib/isono/logger.rb", "lib/isono/manifest.rb", "lib/isono/messaging_client.rb", "lib/isono/models/event_log.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/resource_instance.rb", "lib/isono/node.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/rack.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/job.rb", "lib/isono/rack/map.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/sequel.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/resource_manifest.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/serializer.rb", "lib/isono/thread_pool.rb", "lib/isono/util.rb", "lib/isono/version.rb", "spec/amqp_client_spec.rb", "spec/event_observable_spec.rb", "spec/file_channel_spec.rb", "spec/job_channel_spec.rb", "spec/logger_spec.rb", "spec/manifest_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/rpc_channel_spec.rb", "spec/spec_helper.rb", "spec/thread_pool_spec.rb", "spec/util_spec.rb", "tasks/load_resource_manifest.rake"]
   s.homepage = "http://github.com/axsh/isono"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")

data/lib/isono.rb

@@ -41,6 +41,7 @@ module Isono
     autoload :Job, 'isono/rack/job'
     autoload :DataStore, 'isono/rack/data_store'
     autoload :Map, 'isono/rack/map'
+    autoload :Sequel, 'isono/rack/sequel'
   end
 
   module Models

data/lib/isono/models/job_state.rb

@@ -17,6 +17,7 @@ module Isono
         column :node_id, :varchar, :size=>80, :null=>false
         column :state, :varchar, :size=>10, :null=>false
         column :message, :text, :null=>false, :default=>''
+        column :job_name, :varchar, :size=>255, :null=>true
         column :created_at, :datetime, :null=>false
         column :updated_at, :datetime, :null=>false
         column :started_at, :datetime, :null=>true

data/lib/isono/node_modules/job_channel.rb

@@ -54,6 +54,7 @@ module Isono
           req.timeout_sec = config_section.timeout_sec
           req.request[:job_id] = Util.gen_id
           req.request[:session_id] = req.request[:job_id]
+          req.request[:job_name] = command
          
           # A job is working on this current thread if cur_job_ctx is
           # not nil. Let the new job know the current job ID

data/lib/isono/node_modules/job_collector.rb

@@ -16,21 +16,13 @@ module Isono
       end
 
       class Dispatch
-        # Register new job
-        def regist
+        def record
           params = @req.args[0]
           params[:node_id]=@req.sender
-          job =Models::JobState.new
-          job.set_fields(params, [:job_id, :parent_job_id, :session_id, :node_id, :state]).save
+          job =Models::JobState.find_or_create(:job_id=>params[:job_id])
+          job.set_fields(params, [:parent_job_id, :session_id, :node_id, :state, :started_at, :finished_at, :job_name]).save_changes
         end
         
-        def update
-          params = @req.args[0]
-          job = Models::JobState.find(:job_id=>params[:job_id])
-          raise "Unknown or JOB ID: #{params[:job_id]}" if job.nil?
-          job.set_fields(params, [:state, :started_at, :finished_at]).save
-        end
-
         def call(req, res)
           @req, @res = req, res
           raise Rack::UnknownMethodError if @req.command == 'call'

data/lib/isono/node_modules/job_worker.rb

@@ -47,7 +47,7 @@ module Isono
         @active_jobs[job.job_id] = job
         rpc = RpcChannel.new(node)
 
-        rpc.request('job-collector', 'regist', job.to_hash) { |req|
+        rpc.request('job-collector', 'record', job.to_hash) { |req|
           req.oneshot = true
         }
         
@@ -55,7 +55,7 @@ module Isono
           begin
             Thread.current[JOB_CTX_KEY]=job
             job.process_event(:on_start)
-            rpc.request('job-collector', 'update', job.to_hash) { |req|
+            rpc.request('job-collector', 'record', job.to_hash) { |req|
               req.oneshot = true
             }
             job.run_cb.call
@@ -73,7 +73,7 @@ module Isono
           ensure
             Thread.current[JOB_CTX_KEY]=nil
             EventMachine.schedule {
-              rpc.request('job-collector', 'update', job.to_hash) { |req|
+              rpc.request('job-collector', 'record', job.to_hash) { |req|
                 req.oneshot = true
               }
               @active_jobs.delete(job.job_id)
@@ -121,6 +121,7 @@ module Isono
           super({:job_id        => job_id,
                  :parent_job_id => nil,
                  :session_id    => job_id,
+                 :job_name      => nil,
                  :started_at    => nil,
                  :finished_at   => nil,
                  :finish_status => nil,
@@ -136,11 +137,11 @@ module Isono
           when [:on_start, :init]
             @state = :running
             self.started_at = Time.now
-            logger.info("Job start #{session_id} (Local ID: #{job_id})")
+            logger.info("Job start #{session_id} (Local ID: #{job_id})[ #{job_name} ]")
           when [:on_done, :running]
             @state = :done
             self.finished_at = Time.now
-            logger.info("Job complete #{session_id} (Local ID: #{job_id}): #{elapsed_time} sec")
+            logger.info("Job complete #{session_id} (Local ID: #{job_id})[ #{job_name} ]: #{elapsed_time} sec")
           when [:on_fail, :running]
             @state = :failed
             on_fail(args[0])
@@ -167,7 +168,7 @@ module Isono
         private
         def on_fail(e)
           self.finished_at = Time.now
-          logger.error("Job failed #{session_id}: #{e}")
+          logger.error("Job failed #{session_id} [ #{job_name} ]: #{e}")
           logger.error(e)
         end
         

data/lib/isono/rack/job.rb

@@ -52,6 +52,7 @@ module Rack
         job.job_id = req.r[:job_id]
         job.parent_job_id = req.r[:parent_job_id]
         job.session_id = req.r[:session_id]
+        job.job_name = req.r[:job_name]
         job.run_cb = proc {
           begin
             @app.call(JobRequest.new(req.r, job), JobResponse.new(res.ctx, job))

data/lib/isono/rack/sequel.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+require 'sequel'
+
+module Isono
+module Rack
+  # Middleware for Sequel transaction.
+  class Sequel < Decorator
+    include Isono::Logger
+    
+    def initialize(app, retry_count=10)
+      @app = app
+      @retry_count = retry_count
+    end
+    
+    def call(req, res)
+      retry_count=0
+      begin
+        ::Sequel::DATABASES.first.transaction do
+          @app.call(req, res)
+          res.response(ret) unless res.responded?
+        end
+      rescue ::Sequel::DatabaseError, ::Sequel::DatabaseConnectionError => e
+        retry_count += 1
+        if retry_count < @retry_count
+          logger.error("Database Error: #{e.message} retrying #{retry_count}/#{@retry_count}")
+          retry
+        end
+        
+        res.response(e) unless res.responded?
+        raise e
+      end
+    end
+  end
+end
+end

data/lib/isono/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -154,6 +154,7 @@ files:
 - lib/isono/rack/map.rb
 - lib/isono/rack/object_method.rb
 - lib/isono/rack/proc.rb
+- lib/isono/rack/sequel.rb
 - lib/isono/rack/thread_pass.rb
 - lib/isono/resource_manifest.rb
 - lib/isono/runner/base.rb