wakame 0.4.1 → 0.4.2

data/lib/wakame/event_dispatcher.rb

@@ -86,12 +86,14 @@ module Wakame
       }
     end
     
+    FIRE_EVENT_LOG_IGNORE_EVENTS = [Wakame::Event::AgentPong]
+
     def fire_event(event_obj)
       raise ArgumentError unless event_obj.is_a?(Event::Base)
-      log_msg = ""
-      log_msg = " #{event_obj.log_message}" unless event_obj.log_message.nil?
 
-      Wakame.log.debug("Event #{event_obj.class} has been fired:" + log_msg )
+      if Wakame.log.level == 'DEBUG' && !FIRE_EVENT_LOG_IGNORE_EVENTS.member?(event_obj.class)
+        Wakame.log.debug("Event #{event_obj.class} has been fired:" + (event_obj.log_message.nil? ? "" : event_obj.log_message) )
+      end
       tlist = @event_handlers[event_obj.class]
       return if tlist.nil?
 

data/lib/wakame/initializer.rb

@@ -47,7 +47,7 @@ module Wakame
     end
 
     def setup_load_paths
-      load_paths = configuration.load_paths + configuration.framework_paths
+      load_paths = configuration.load_paths + configuration.project_paths + configuration.framework_paths
       load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
       $LOAD_PATH.uniq!
 

data/lib/wakame/master.rb

@@ -42,7 +42,7 @@ module Wakame
         }
         
         kill_list.each { |agent_id|
-          agent = @agents.delete(agent_id)
+          agent = @registered_agents.delete(agent_id)
           ED.fire_event(Event::AgentUnMonitored.new(agent)) unless agent.nil?
         }
         #Wakame.log.debug("Finished agent GC")
@@ -129,7 +129,7 @@ module Wakame
           when Actor::STATUS_RUNNING
               ED.fire_event(Event::ActorProgress.new(response[:agent_id], response[:token], 0))
           else
-              ED.fire_event(Event::ActorComplete.new(response[:agent_id], response[:token], response[:status]))
+              ED.fire_event(Event::ActorComplete.new(response[:agent_id], response[:token], response[:status], response[:opts][:return_value]))
           end
         else
           Wakame.log.warn("#{self.class}: Unhandled agent response: #{response[:type]}")
@@ -162,6 +162,7 @@ module Wakame
         ED.fire_event(Event::AgentMonitored.new(agent))
       end
       agent.root_path = data[:root_path]
+      agent.attr = data[:attrs]
     end
 
     def unregister_agent(agent_id)
@@ -299,7 +300,7 @@ module Wakame
 
 
   class ActorRequest
-    attr_reader :master
+    attr_reader :master, :return_value
 
     def initialize(master, packet)
       raise TypeError unless packet.is_a?(Wakame::Packets::ActorRequest)
@@ -308,6 +309,7 @@ module Wakame
       @packet = packet
       @requested = false
       @event_ticket = nil
+      @return_value = nil
       @wait_lock = ::Queue.new
     end
 
@@ -316,13 +318,14 @@ module Wakame
       raise "The request has already been sent." if @requested
 
       @event_ticket = ED.subscribe(Event::ActorComplete) { |event|
-       if event.token == @packet.token
+        if event.token == @packet.token
          
-         # Any of status except RUNNING are accomplishment of the actor request.
-         Wakame.log.debug("#{self.class}: The actor request has been completed: token=#{self.token}, status=#{event.status}")
-         ED.unsubscribe(@event_ticket)
-         @wait_lock.enq(event.status)
-       end
+          # Any of status except RUNNING are accomplishment of the actor request.
+          Wakame.log.debug("#{self.class}: The actor request has been completed: token=#{self.token}, status=#{event.status}, return_value=#{event.return_value}")
+          ED.unsubscribe(@event_ticket)
+          @return_value = event.return_value
+          @wait_lock.enq([event.status, event.return_value])
+        end
       }
       Wakame.log.debug("#{self.class}: Send the actor request: #{@packet.path}@#{@packet.agent_id}, token=#{self.token}")
       master.publish_to('agent_command', "agent_id.#{@packet.agent_id}", @packet.marshal)
@@ -352,11 +355,12 @@ module Wakame
       check_requested?
       timeout(tout) {
         Wakame.log.debug("#{self.class}: Waiting a response from the actor: #{@packet.path}@#{@packet.agent_id}, token=#{@packet.token}")
-        ret_status = @wait_lock.deq
+        ret_status, ret_val = @wait_lock.deq
         Wakame.log.debug("#{self.class}: A response (status=#{ret_status}) back from the actor: #{@packet.path}@#{@packet.agent_id}, token=#{@packet.token}")
         if ret_status == Actor::STATUS_FAILED
           raise RuntimeError, "Failed status has been returned: Actor Request #{token}"
         end
+        ret_val
       }
     end
     alias :wait :wait_completion

data/lib/wakame/monitor/agent.rb

@@ -23,12 +23,7 @@ class Wakame::Monitor::Agent
 
 
   def check
-    if Wakame.environment == :EC2
-      require 'wakame/vm_manipulator'
-      attrs = Wakame::VmManipulator::EC2::MetadataService.fetch_local_attrs
-    else
-      attrs = Wakame::VmManipulator::StandAlone.fetch_local_attrs
-    end
+    attrs = Wakame::VmManipulator.create.fetch_local_attrs
 
     res = {:attrs=>attrs, :monitors=>[], :actors=>[], :services=>{}}
     EM.barrier {

data/lib/wakame/monitor/service.rb

@@ -21,6 +21,9 @@ class Wakame::Monitor::Service
 
     def start
       if !@timer.running?
+        # Runs checker once for immediate status update.
+        signal_checker
+
         @timer.start
         @service_monitor.send_event(Wakame::Packets::MonitoringStarted.new(@service_monitor.agent, self.svc_id))
         Wakame.log.debug("#{self.class}: Started the checker")
@@ -174,10 +177,19 @@ class Wakame::Monitor::Service
   def unregister(svc_id)
     chk = @checkers[svc_id]
     if chk
-      chk.timer.stop
+      chk.stop
       @checkers.delete(svc_id)
       Wakame.log.info("#{self.class}: Unregistered service checker for #{svc_id}")
     end
   end
 
+  def check_status(svc_id)
+    chk = @checkers[svc_id]
+    if chk
+      chk.status
+    else
+      raise RuntimeError, "#{self.class}: Specified service id was not found: #{svc_id}"
+    end
+  end
+
 end

data/lib/wakame/packets.rb

@@ -10,7 +10,9 @@ module Wakame
     class ResponseBase
       include AttributeHelper
 
-      attr_reader :agent_id, :responded_at
+      #attr_reader :agent_id, :responded_at
+      def_attribute :agent_id
+      def_attribute :responded_at
       
       def initialize(agent)
         raise TypeError unless agent.respond_to?(:agent_id)
@@ -29,7 +31,9 @@ module Wakame
     class RequestBase
       include AttributeHelper
 
-      attr_reader :token, :requested_at
+      #attr_reader :token, :requested_at
+      def_attribute :token
+      def_attribute :requested_at
 
       def initialize(token=nil)
         @token = token || Util.gen_id
@@ -43,7 +47,12 @@ module Wakame
     end
     
     class Ping < ResponseBase
-      attr_reader :attrs, :monitors, :actors, :services
+      #attr_reader :attrs, :monitors, :actors, :services
+      def_attribute :attrs
+      def_attribute :monitors
+      def_attribute :actors
+      def_attribute :services
+
       def initialize(agent, attrs, actors, monitors, services)
         super(agent)
         @attrs = attrs
@@ -55,10 +64,14 @@ module Wakame
     
 
     class Register < ResponseBase
-      attr_reader :root_path
-      def initialize(agent, root_path)
+      #attr_reader :root_path, :attrs
+      def_attribute :root_path
+      def_attribute :attrs
+
+      def initialize(agent, root_path, attrs)
         super(agent)
         @root_path = root_path
+        @attrs = attrs
       end
     end
 
@@ -69,7 +82,9 @@ module Wakame
     end
 
     class MonitoringStarted < ResponseBase
-      attr_reader :svc_id
+      #attr_reader :svc_id
+      def_attribute :svc_id
+      
       def initialize(agent, svc_id)
         super(agent)
         @svc_id = svc_id
@@ -77,14 +92,19 @@ module Wakame
     end
 
     class MonitoringStopped < ResponseBase
-      attr_reader :svc_id
+      #attr_reader :svc_id
+      def_attribute :svc_id
+
       def initialize(agent, svc_id)
         super(agent)
         @svc_id = svc_id
       end
     end
     class MonitoringOutput < ResponseBase
-      attr_reader :svc_id, :outputs
+      #attr_reader :svc_id, :outputs
+      def_attribute :svc_id
+      def_attribute :outputs
+
       def initialize(agent, svc_id, outputs)
         super(agent)
         @svc_id = svc_id
@@ -93,7 +113,9 @@ module Wakame
     end
 
     class EventResponse < ResponseBase
-      attr_reader :event
+      #attr_reader :event
+      def_attribute :event
+
       def initialize(agent, event)
         super(agent)
         @event = event
@@ -126,7 +148,12 @@ module Wakame
 #     end
 
     class ServiceStatusChanged < ResponseBase
-      attr_accessor :svc_id, :prev_status, :new_status, :fail_message
+      #attr_accessor :svc_id, :prev_status, :new_status, :fail_message
+      def_attribute :svc_id
+      def_attribute :prev_status
+      def_attribute :new_status
+      def_attribute :fail_message
+
       def initialize(agent, svc_id, prev_status, new_status, fail_message=nil)
         super(agent)
         @svc_id = svc_id
@@ -137,7 +164,12 @@ module Wakame
     end
 
     class ActorRequest < RequestBase
-      attr_reader :agent_id, :token, :path, :args
+      #attr_reader :agent_id, :token, :path, :args
+      def_attribute :agent_id
+      def_attribute :token
+      def_attribute :path
+      def_attribute :args
+
       def initialize(agent_id, token, path, *args)
         super()
         @agent_id = agent_id
@@ -148,11 +180,17 @@ module Wakame
     end
 
     class ActorResponse < ResponseBase
-      attr_reader :agent_id, :token, :status
-      def initialize(agent, token, status)
+      #attr_reader :agent_id, :token, :status, :opts
+      def_attribute :agent_id
+      def_attribute :token
+      def_attribute :status
+      def_attribute :opts
+
+      def initialize(agent, token, status, opts={})
         super(agent)
         @token = token
         @status = status
+        @opts = opts
       end
     end
 

data/lib/wakame/rule_engine.rb

@@ -34,7 +34,6 @@ module Wakame
       
       @active_jobs = {}
       @job_history = []
-      @global_lock = nil
       instance_eval(&blk) if blk
     end
 
@@ -52,7 +51,7 @@ module Wakame
         :job_id=>job_id,
         :src_trigger=>trigger,
         :create_at=>Time.now,
-        :start_at=>nil, 
+        :start_at=>nil,
         :complete_at=>nil,
         :root_action=>root_action,
         :notes=>{}
@@ -97,16 +96,6 @@ module Wakame
       job_context = @active_jobs[action.job_id]
       raise "The job session is killed.: job_id=#{action.job_id}" if job_context.nil?
 
-      if action.acquire_lock
-        if @global_lock.nil?
-          @global_lock = action.job_id
-        else
-          unless @global_lock == action.job_id
-            raise GlobalLockError, "Global Lock is already acquired by the JobID: #{@global_lock}"
-          end
-        end
-      end
-
       EM.next_tick {
 
         begin
@@ -170,17 +159,17 @@ module Wakame
               next
             end
             
-            jobary = []
-            job_context[:root_action].walk_subactions {|a| jobary << a }
-            Wakame.log.debug(jobary.collect{|a| {a.class.to_s=>a.status}}.inspect)
+            actary = []
+            job_context[:root_action].walk_subactions {|a| actary << a }
+            Wakame.log.debug(actary.collect{|a| {a.class.to_s=>a.status}}.inspect)
 
             if res.is_a?(Exception)
               job_context[:exception]=res
             end
 
-            if jobary.all? { |act| act.status == :complete }
+            if actary.all? { |act| act.status == :complete }
 
-              if jobary.all? { |act| act.completion_status == :succeeded }
+              if actary.all? { |act| act.completion_status == :succeeded }
                 ED.fire_event(Event::JobComplete.new(action.job_id))
               else
                 ED.fire_event(Event::JobFailed.new(action.job_id, res))
@@ -189,7 +178,7 @@ module Wakame
               job_context[:complete_at]=Time.now
               @job_history << job_context
               @active_jobs.delete(job_context[:job_id])
-              @global_lock = nil
+              service_cluster.lock_queue.quit(job_context[:job_id])
             end
           }
         rescue => e