isono 0.2.13 → 0.2.14

data/Rakefile

@@ -16,7 +16,7 @@ task :gem do
     s.summary = 'Messaging and agent fabric'
     s.name = 'isono'
     s.require_path = 'lib'
-    s.required_ruby_version = '>= 1.8.7'
+    s.required_ruby_version = '>= 1.9.2'
     s.rubyforge_project = 'isono'
     
     s.files = `git ls-files -c`.split("\n")
@@ -26,7 +26,6 @@ task :gem do
     
     s.add_dependency "amqp", "0.7.4"
     s.add_dependency "eventmachine", "1.0.0.beta.4"
-    s.add_dependency "statemachine", ">= 1.0.0"
     s.add_dependency "log4r"
 
     s.add_development_dependency 'bacon'

data/isono.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = "2012-08-08"
+  s.date = "2012-08-30"
   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/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")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
   s.rubyforge_project = "isono"
   s.rubygems_version = "1.8.24"
   s.summary = "Messaging and agent fabric"
@@ -23,14 +23,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<amqp>, ["= 0.7.4"])
       s.add_runtime_dependency(%q<eventmachine>, ["= 1.0.0.beta.4"])
-      s.add_runtime_dependency(%q<statemachine>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<log4r>, [">= 0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<amqp>, ["= 0.7.4"])
       s.add_dependency(%q<eventmachine>, ["= 1.0.0.beta.4"])
-      s.add_dependency(%q<statemachine>, [">= 1.0.0"])
       s.add_dependency(%q<log4r>, [">= 0"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -38,7 +36,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<amqp>, ["= 0.7.4"])
     s.add_dependency(%q<eventmachine>, ["= 1.0.0.beta.4"])
-    s.add_dependency(%q<statemachine>, [">= 1.0.0"])
     s.add_dependency(%q<log4r>, [">= 0"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])

data/lib/isono/models/job_state.rb

@@ -7,7 +7,7 @@ module Isono
     class JobState < Sequel::Model
       include Logger
       plugin :schema
-      plugin :hook_class_methods
+      plugin :timestamps, :update_on_create=>true
 
       set_schema {
         primary_key :id, :type => Integer, :auto_increment=>true, :unsigned=>true
@@ -25,13 +25,6 @@ module Isono
         index :job_id, {:unique=>true}
       }
 
-      before_create(:set_created_at) do
-        self.created_at = self.updated_at= Time.now
-      end
-      before_update(:set_updated_at) do
-        self.updated_at= Time.now
-      end
-
     end
   end
 end

data/lib/isono/models/node_state.rb

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 
 require 'sequel/model'
-require 'statemachine'
 
 module Isono
   module Models
     class NodeState < Sequel::Model
       include Logger
       plugin :schema
-      plugin :hook_class_methods
+      plugin :timestamps, :update_on_create=>true
 
       set_schema {
         primary_key :id, :type => Integer, :auto_increment=>true, :unsigned=>true
@@ -21,48 +20,28 @@ module Isono
         index :node_id, {:unique=>true}
       }
 
-      before_create(:set_created_at) do
-        self.updated_at = self.created_at = Time.now
+      def after_initialize
+        self[:state] = :init
       end
-      before_update(:set_updated_at) do
-        self.updated_at = Time.now
-      end
-
-
-      def state_machine
-        model = self
-        st = Statemachine.build do
-          startstate :init
-          trans :init,    :on_ping,      :online, proc {model.last_ping_at = Time.now}
-          trans :online,  :on_timeout,   :timeout
-          trans :timeout, :on_ping,      :online, proc {model.last_ping_at = Time.now}
-          trans :online,  :on_unmonitor, :offline
-          trans :timeout, :on_unmonitor, :offline
-          # do nothing on transition from and to the same state
-          trans :online,  :on_ping,      :online, proc {model.last_ping_at = Time.now}
-          trans :timeout, :on_timeout,   :timeout
-
-          on_entry_of :online, proc {
-            model.state = :online
-          }
-          on_entry_of :timeout, proc {
-            model.state = :timeout
-          }
-          on_entry_of :offline, proc {
-            model.state = :offline
-          }
-        end
-
-        if self[:state]
-          if st.has_state(self[:state].to_sym)
-            st.state = self[:state].to_sym
-          else
-            raise "Unknown state: #{self[:state]}"
-          end
+      
+      def process_event(ev, *args)
+        case [ev, self.state.to_sym]
+        when [:on_ping, :online], [:on_ping, :init], [:on_ping, :timeout]
+          self.state = :online
+          self.last_ping_at = Time.now
+        when [:on_unmonitor, :online]
+          self.state = :offline
+        when [:on_unmonitor, :timeout]
+          self.state = :offline
+        when [:on_unmonitor, :init]
+          self.state = :offline
+        when [:on_timeout, :online], [:on_timeout, :timeout]
+          self.state = :timeout
+        when [:on_timeout, :init]
+          # Do nothing
         else
-          st.reset
+          raise "Unknown state transition: #{ev}, #{self.state}"
         end
-        st
       end
 
     end

data/lib/isono/node_modules/base.rb

@@ -12,6 +12,7 @@ module Isono
         
         raise "Module initializer_hook is not run yet" if self.value_object.nil?
         value_object.copy_instance_variables(self)
+        after_initialize
       end
       
       # Delegate methods used in subclass frequently.
@@ -75,6 +76,10 @@ module Isono
           @node_hooks = {}
         }
       end
+
+      protected
+      def after_initialize
+      end
       
     end
   end

data/lib/isono/node_modules/job_channel.rb

@@ -72,10 +72,15 @@ module Isono
       
       def cancel(job_id)
       end
-      
+
       def register_endpoint(endpoint, app, opts={})
-        opts = {:concurrency=>config_section.concurrency}.merge(opts)
-        rpc.register_endpoint("job.#{endpoint}", Rack::Job.new(app, JobWorker.new(node)), {:prefetch=>opts[:concurrency]})
+        raise ArgumentError unless endpoint.is_a?(String)
+        raise ArgumentError unless app.respond_to?(:call)
+        opts = {
+          :concurrency=>config_section.concurrency,
+          :thread_pool => nil,
+        }.merge(opts)
+        rpc.register_endpoint("job.#{endpoint}", Rack::Job.new(app, JobWorker.new(@node, opts[:thread_pool])), {:prefetch=>opts[:concurrency]})
       end
 
       private

data/lib/isono/node_modules/job_worker.rb

@@ -14,7 +14,7 @@ module Isono
       end
       
       initialize_hook do
-        @thread_pool = ThreadPool.new(config_section.concurrency.to_i, 'JobWorker')
+        @default_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|
@@ -31,6 +31,12 @@ module Isono
         @thread_pool.shutdown
       end
 
+      def initialize(node, thread_pool=nil)
+        super(node)
+        raise ArgumentError unless thread_pool.nil? || thread_pool.is_a?(ThreadPool)
+        @thread_pool = thread_pool || @default_thread_pool
+      end
+      
       # Start a new long term job.
       #
       # @yield The block to setup JobContext object.

data/lib/isono/node_modules/node_collector.rb

@@ -30,22 +30,20 @@ module Isono
             # http://www.mail-archive.com/sqlite-users@sqlite.org/msg03328.html
             # TODO: paging support for the large result set.
             Models::NodeState.dataset.all.each { |row|
-              
-              sm = row.state_machine
-              next if sm.state == :offline
+              next if row.state == :offline
 
               diff_time = Time.now - row[:last_ping_at]
-              if sm.state != :timeout && diff_time > config_section.timeout_sec
-                sm.on_timeout
+              if row.state != :timeout && diff_time > config_section.timeout_sec
+                row.process_event(:on_timeout)
                 row.save_changes
                 event.publish('node_collector/timedout', :args=>[row.values])
               end
               
               if diff_time > config_section.kill_sec
-                sm.on_unmonitor
+                row.process_event(:on_unmonitor)
 
                 event.publish('node_collector/killed', :args=>[row.values])
-                row.delete
+                row.destroy
               end
             }
           }
@@ -71,7 +69,7 @@ module Isono
         event = EventChannel.new(node)
         
         a = Models::NodeState.find(:node_id=>node_id) || Models::NodeState.new(:node_id=>node_id)
-        a.state_machine.on_ping
+        a.process_event(:on_ping)
         if a.new?
           a.boot_token = boot_token
           a.save

data/lib/isono/node_modules/rpc_channel.rb

@@ -164,7 +164,7 @@ module Isono
       #    :prefetch
       def register_endpoint(endpoint, app, opts={})
         raise TypeError unless app.respond_to?(:call)
-        opts = {:exclusive=>true, :prefetch=>0}.merge(opts)
+        opts = {:exclusive=>true, :prefetch=>1}.merge(opts)
         
         # create receive queue for new RPC endpoint.
         endpoint_proc = proc { |header, data|
@@ -190,13 +190,8 @@ module Isono
 
         
         EventMachine.schedule {
-          ch = if opts[:prefetch].to_i > 0
-                 # create per endpoint channel
-                 node.create_channel
-               else
-                 # use default channel
-                 @amq
-               end
+          ch = node.create_channel
+
           ch.instance_eval %Q{
             def endpoint_queue
               self.queue("isono.rpc.endpoint.#{endpoint}", {:exclusive=>false, :auto_delete=>true})

data/lib/isono/rack/job.rb

@@ -44,6 +44,7 @@ module Rack
     
     def initialize(app, job_worker)
       super(app)
+      raise ArgumentError unless job_worker.respond_to?(:start)
       @job_worker = job_worker
     end
     

data/lib/isono/runner/rpc_server.rb

@@ -80,36 +80,44 @@ module Isono
             add(:rpc, command, &blk)
           end
 
-          def build(endpoint, node)
-            helper_context = self.new(node)
-            
-            app_builder = lambda { |builders|
-              unless builders.empty?
-                map_app = Rack::Map.new
-                builders.each { |b|
-                  b.call(map_app, helper_context)
-                }
-                map_app
-              end
-            }
+          def concurrency(num)
+            raise ArgumentError unless num.is_a?(Fixnum)
+            @concurrency = num
+          end
 
+          def job_thread_pool(thread_pool)
+            raise ArgumentError unless thread_pool.is_a?(Isono::ThreadPool)
+            @job_thread_pool = thread_pool
+          end
+          
+          def setup(endpoint_name, builder)
+            app_builder = lambda { |builder_hooks|
+              return nil if builder_hooks.empty?
+              map_app = Rack::Map.new
+              builder_hooks.each { |b|
+                b.call(map_app, builder)
+              }
+              map_app
+            }
+            
             app = app_builder.call(@builders[:job])
             if app
-              NodeModules::JobChannel.new(node).register_endpoint(endpoint, Rack.build do
-                                                                    run app
-                                                                  end)
+              builder.job_channel.register_endpoint(endpoint_name,
+                                                    Rack.build do
+                                                      run app
+                                                    end,
+                                                    {:concurrency=>@concurrency,
+                                                      :thread_pool=>@job_thread_pool})
             end
             
             app = app_builder.call(@builders[:rpc])
             if app
-              NodeModules::RpcChannel.new(node).register_endpoint(endpoint, Rack.build do
-                                                                    run app
-                                                                  end
-                                                                  )
+              builder.rpc_channel.register_endpoint(endpoint, Rack.build do
+                                                      run app
+                                                    end, {:prefetch=>@concurrency})
             end
           end
           
-          
           protected
           def add(type, command, &blk)
             @builders[type] << lambda { |rack_map, ctx|
@@ -121,15 +129,33 @@ module Isono
         def self.inherited(klass)
           klass.class_eval {
             @builders = {:job=>[], :rpc=>[]}
+            @concurrency = 1
+            @job_thread_pool = nil
             extend BuildMethods
           }
         end
 
         def initialize(node)
           @node = node
+          @rpc_channel = NodeModules::RpcChannel.new(@node)
+          @job_channel = NodeModules::JobChannel.new(@node)
+          after_initialize
+        end
+
+        def job_channel
+          @job_channel
+        end
+        alias :job :job_channel
+
+        def rpc_channel
+          @rpc_channel
+        end
+        alias :rpc :rpc_channel
+
+        protected
+        def after_initialize
         end
       end
-      
 
       DEFAULT_MANIFEST = Manifest.new(Dir.pwd) do
         load_module NodeModules::EventChannel
@@ -147,13 +173,15 @@ module Isono
       class Server < Base
         def initialize(builder_block)
           super()
+          @endpoints = {}
           @builder_block = builder_block
         end
 
         # DSL method
-        def endpoint(endpoint, builder)
-          raise TypeError unless builder.respond_to?(:build)
-          builder.build(endpoint, @node)
+        def endpoint(endpoint, builder_class, *args)
+          raise ArgumentError unless builder_class.is_a?(Class) && builder_class < EndpointBuilder
+          raise "Duplicate endpoint name: #{endpoint}" if @endpoints[endpoint.to_s]
+          @endpoints[endpoint.to_s] = builder_class.new(@node, *args)
         end
         
         protected
@@ -161,6 +189,8 @@ module Isono
           @node = Isono::Node.new(manifest)
           @node.connect(@options[:amqp_server_uri]) do
             self.instance_eval(&@builder_block) if @builder_block
+
+            @endpoints.each {|name, i| i.class.setup(name, i) }
           end
         end
         

data/lib/isono/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -44,22 +44,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta.4
-- !ruby/object:Gem::Dependency
-  name: statemachine
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: