isono 0.2.11 → 0.2.12

data/isono.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.11"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = "2012-04-23"
+  s.date = "2012-06-05"
   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"]
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "isono"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Messaging and agent fabric"
 
   if s.respond_to? :specification_version then

data/lib/isono/models/job_state.rb

@@ -13,6 +13,7 @@ module Isono
         primary_key :id, :type => Integer, :auto_increment=>true, :unsigned=>true
         column :job_id, :varchar, :size=>80, :null=>false
         column :parent_job_id, :varchar, :size=>80, :null=>true
+        column :session_id, :varchar, :size=>80, :null=>true
         column :node_id, :varchar, :size=>80, :null=>false
         column :state, :varchar, :size=>10, :null=>false
         column :message, :text, :null=>false, :default=>''

data/lib/isono/node_modules/job_channel.rb

@@ -53,12 +53,14 @@ module Isono
         req = rpc.request("job.#{endpoint}", command, *args) { |req|
           req.timeout_sec = config_section.timeout_sec
           req.request[:job_id] = Util.gen_id
-          
+          req.request[:session_id] = req.request[:job_id]
+         
           # A job is working on this current thread if cur_job_ctx is
           # not nil. Let the new job know the current job ID
           # as its parent job ID.
           if cur_job_ctx
             req.request[:parent_job_id] = cur_job_ctx.job_id
+            req.request[:session_id] = cur_job_ctx.session_id
           end
 
           blk ? blk.call(req) : req.synchronize

data/lib/isono/node_modules/job_collector.rb

@@ -21,7 +21,7 @@ module Isono
           params = @req.args[0]
           params[:node_id]=@req.sender
           job =Models::JobState.new
-          job.set_fields(params, [:job_id, :parent_job_id, :node_id, :state]).save
+          job.set_fields(params, [:job_id, :parent_job_id, :session_id, :node_id, :state]).save
         end
         
         def update

data/lib/isono/node_modules/job_worker.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'ostruct'
 
 module Isono
   module NodeModules
@@ -116,13 +117,14 @@ module Isono
         attr_reader :state
         
         def initialize()
-          super({:job_id=>Util.gen_id,
-                  :parent_job_id=>nil,
-                  :started_at=>nil,
-                  :finished_at=>nil,
-                  :finish_status=>nil,
+          job_id = Util.gen_id
+          super({:job_id        => job_id,
+                 :parent_job_id => nil,
+                 :session_id    => job_id,
+                 :started_at    => nil,
+                 :finished_at   => nil,
+                 :finish_status => nil,
                 })
-
           @run_cb=proc{}
           @fail_cb=nil
 
@@ -134,11 +136,11 @@ module Isono
           when [:on_start, :init]
             @state = :running
             self.started_at = Time.now
-            logger.info("Job start #{job_id}")
+            logger.info("Job start #{session_id} (Local ID: #{job_id})")
           when [:on_done, :running]
             @state = :done
             self.finished_at = Time.now
-            logger.info("Job complete #{job_id}: #{elapsed_time} sec")
+            logger.info("Job complete #{session_id} (Local ID: #{job_id}): #{elapsed_time} sec")
           when [:on_fail, :running]
             @state = :failed
             on_fail(args[0])
@@ -165,7 +167,7 @@ module Isono
         private
         def on_fail(e)
           self.finished_at = Time.now
-          logger.error("Job failed #{job_id}: #{e}")
+          logger.error("Job failed #{session_id}: #{e}")
           logger.error(e)
         end
         

data/lib/isono/node_modules/rpc_channel.rb

@@ -266,13 +266,10 @@ module Isono
             @active_requests[req.ticket] = req
           end
 
-          # create receiver queue if it is requested at first time
-          # from this node. This allows that the receiver became ready
-          # after the sender can proceed the request.
-          if @requested_endpoints[req.endpoint].nil?
-            amq.queue(endpoint_queue_name(req.endpoint), {:exclusive=>false, :auto_delete=>true})
-            @requested_endpoints[req.endpoint] = 1
-          end
+          # create receiver queue every time before publish the message.
+          # This helps to receive messages from the failed receiver.
+          amq.queue(endpoint_queue_name(req.endpoint), {:exclusive=>false, :auto_delete=>true})
+          @requested_endpoints[req.endpoint] = 1
 
           amq.default_exchange.publish(Serializer.instance.marshal(req.request_hash),
                                        {:message_id => req.ticket,

data/lib/isono/rack/job.rb

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

data/lib/isono/runner/rpc_server.rb

@@ -37,6 +37,12 @@ module Isono
     module RpcServer
 
       class EndpointBuilder
+        def session_id
+          job_context.session_id
+        end
+        def job_context
+          Thread.current[Isono::NodeModules::JobWorker::JOB_CTX_KEY]
+        end
         module BuildMethods
           # @exmaple
           # job 'command1', proc {

data/lib/isono/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &7228680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *7228680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &7228160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *7228160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
 - !ruby/object:Gem::Dependency
   name: statemachine
-  requirement: &7227640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7227640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &7227120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7227120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &7226520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7226520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7225920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +102,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7225920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - dev@axsh.net
@@ -166,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: isono
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Messaging and agent fabric