wakame 0.5.0 → 0.5.1

data/lib/wakame/models/object_store.rb

@@ -0,0 +1,32 @@
+
+require 'sequel/model'
+
+module Wakame
+  module Models
+    class ObjectStore < Sequel::Model
+      plugin :schema
+      plugin :hook_class_methods
+
+      unrestrict_primary_key
+
+      set_schema {
+        primary_key :id, :string, :size=>50, :auto_increment=>false
+        column :class_type, :string
+        column :dump, :text
+        column :created_at, :datetime
+        column :updated_at, :datetime
+      }
+      
+      before_create(:set_created_at) do
+        self.updated_at = self.created_at = Time.now
+      end
+      before_update(:set_updated_at) do
+        self.updated_at = Time.now
+      end
+
+    end
+  end
+
+  Initializer.loaded_classes << Models::ObjectStore
+end
+

data/lib/wakame/models/service_cluster_pool.rb

@@ -0,0 +1,36 @@
+
+require 'sequel/model'
+
+module Wakame
+  module Models
+    class ServiceClusterPool < Sequel::Model
+      plugin :schema
+      
+      set_schema {
+        primary_key :id, :type => Integer
+        varchar :service_cluster_id
+      }
+      
+      
+      def self.register_cluster(name)
+        id = Service::ServiceCluster.id(name)
+        
+        self.find_or_create(:service_cluster_id=>id)
+      end
+      
+      def self.unregister_cluster(name)
+        id = Service::ServiceCluster.id(name)
+        self.delete(:service_cluster_id=>id)
+      end
+      
+      def self.each_cluster(&blk)
+        self.all.each { |m|
+          cluster = Service::ServiceCluster.find(m.service_cluster_id)
+          blk.call(cluster)
+        }
+      end
+    end
+  end
+
+  Initializer.loaded_classes << Models::ServiceClusterPool
+end

data/lib/wakame/monitor.rb

@@ -14,18 +14,15 @@ module Wakame
       }
     end
 
-    def handle_request(request)
-    end
-
-    def setup(assigned_path)
-    end
-
     def enable
     end
 
     def disable
     end
 
+    def reload(config)
+    end
+
     def publish_to(exchange, data)
       agent.publish_to(exchange, data)
     end

data/lib/wakame/monitor/agent.rb

@@ -10,18 +10,21 @@ class Wakame::Monitor::Agent
     publish_to('ping', Wakame::Packets::Ping.new(agent, hash[:attrs], hash[:actors], hash[:monitors], hash[:services]).marshal)
   end
 
-  def setup(path)
+  def reload(config)
     # Send the first ping signal as soon as possible since the ping contanins vital information to construct the Agent object on master node.
     send_ping(check())
 
+    if @timer && @time.running?
+      @timer.stop
+    end
+
     # Setup periodical ping publisher.
-    @timer = CheckerTimer.new(10) {
+    @timer = CheckerTimer.new(config[:interval] || 10) {
       send_ping(check())
     }
     @timer.start
   end
 
-
   def check
     if Wakame.config.environment == :EC2
       attrs = Wakame::Agent.ec2_fetch_local_attrs
@@ -31,14 +34,14 @@ class Wakame::Monitor::Agent
 
     res = {:attrs=>attrs, :monitors=>[], :actors=>[], :services=>{}}
     EM.barrier {
-      agent.monitor_registry.monitors.each { |key, m|
+      agent.monitor_manager.monitors.each { |key, m|
         res[:monitors] << {:class=>m.class.to_s}
       }
-      agent.actor_registry.actors.each { |key, a|
+      agent.actor_manager.actors.each { |key, a|
         res[:actors] << {:class=>a.class.to_s}
       }
 
-      svcmon = agent.monitor_registry.find_monitor('/service')
+      svcmon = agent.monitor_manager.find_monitor('/service')
       svcmon.checkers.each { |svc_id, a|
         res[:services][svc_id]={:status=>a.status}
       }

data/lib/wakame/monitor/service.rb

@@ -1,20 +1,20 @@
 
 require 'open4'
-require 'wakame'
 
 class Wakame::Monitor::Service
 
   class ServiceChecker
     #include Wakame::Packets::Agent
-    attr_reader :timer, :svc_id
+    attr_reader :timer, :svc_id, :interval
     attr_accessor :last_checked_at, :status
 
-    def initialize(svc_id, svc_mon)
+    def initialize(svc_id, svc_mon, interval)
       @svc_id = svc_id
       @service_monitor = svc_mon
+      @interval = interval
       @status = Wakame::Service::STATUS_OFFLINE
       count = 0
-      @timer = Wakame::Monitor::CheckerTimer.new(5) {
+      @timer = Wakame::Monitor::CheckerTimer.new(@interval) {
         self.signal_checker
       }
     end
@@ -80,8 +80,8 @@ class Wakame::Monitor::Service
   end
 
   class PidFileChecker < ServiceChecker
-    def initialize(svc_id, svc_mon, pidpath)
-      super(svc_id, svc_mon)
+    def initialize(svc_id, svc_mon, pidpath, interval)
+      super(svc_id, svc_mon, interval)
       @pidpath = pidpath
     end
     
@@ -99,8 +99,8 @@ class Wakame::Monitor::Service
   class CommandChecker < ServiceChecker
     attr_reader :command
 
-    def initialize(svc_id, svc_mon, cmdstr)
-      super(svc_id, svc_mon)
+    def initialize(svc_id, svc_mon, cmdstr, interval)
+      super(svc_id, svc_mon, interval)
       @command = cmdstr
     end
 
@@ -114,10 +114,11 @@ class Wakame::Monitor::Service
           outputs << l
         }
       }
-      Wakame.log.debug("#{self.class}: Exit Status #{@command}: #{cmdstat}")
       if outputs.size > 0
         @service_monitor.send_event(Wakame::Packets::MonitoringOutput.new(@service_monitor.agent, self.svc_id, outputs.join('')))
       end
+
+      Wakame.log.debug("#{self.class}: Detected the failed exit status: #{@command}: #{cmdstat}") if cmdstat.exitstatus != 0
       cmdstat.exitstatus == 0 ? Wakame::Service::STATUS_ONLINE : Wakame::Service::STATUS_OFFLINE
     end
   end
@@ -131,28 +132,11 @@ class Wakame::Monitor::Service
     @checkers = {}
   end
 
-  def setup(path)
-  end
-
-  def handle_request(request)
-    svc_id = request[:svc_id]
-    case request[:command]
-    when :start
-      register(svc_id, request[:cmdstr])
-    when :stop
-      unregister(svc_id)
-    end
-  end
-
   def send_event(a)
-    Wakame.log.debug("Sending back the event: #{a.class}")
+    #Wakame.log.debug("Sending back the event: #{a.class}")
     publish_to('agent_event', a.marshal)
   end
 
-  def dump_attrs
-    
-  end
-
   def find_checker(svc_id)
     @checkers[svc_id]
   end
@@ -164,9 +148,9 @@ class Wakame::Monitor::Service
     end
     case checker_type.to_sym
     when :pidfile
-      chk = PidFileChecker.new(svc_id, self, args[0])
+      chk = PidFileChecker.new(svc_id, self, args[0], args[1])
     when :command
-      chk = CommandChecker.new(svc_id, self, args[0])
+      chk = CommandChecker.new(svc_id, self, args[0], args[1])
     else
       raise "Unsupported checker type: #{checker_type}"
     end
@@ -193,4 +177,47 @@ class Wakame::Monitor::Service
     end
   end
 
+  def unregister_all
+    @checkers.keys.each { |svc_id|
+      unregister(svc_id)
+    }
+  end
+
+  # Reloading the service monitor with new configuration.
+  #
+  # Example of Hash data in config:
+  # config = {
+  #   'svc_id_abcde'=>{:type=>:pidfile, :path=>'/var/run/a.pid', :interval=>5},
+  #   'svc_id_12345'=>{:type=>:command, :cmdline=>'/bin/ps -ef | grep processname', :interval=>10}
+  # }
+  def reload(config)
+    unregister_all
+
+    reg_single = proc { |svc_id, data|
+      data[:interval] ||= 5
+
+      case data[:type]
+      when :pidfile
+        register(svc_id, data[:type], data[:path], data[:interval])
+      when :command
+        register(svc_id, data[:type], data[:cmdline], data[:interval])
+      else
+        raise "Unsupported checker type: #{data[:type]}"
+      end
+    }
+    
+    config.each { |svc_id, data|
+      if data.is_a?(Array)
+        # TODO: Multiple monitors for single service ID
+        raise "TODO: Multiple monitors for single service ID"
+        data.each { |d|
+          reg_single.call(svc_id, d)
+        }
+      elsif data.is_a?(Hash)
+        reg_single.call(svc_id, data)
+      else
+      end
+    }
+  end
+
 end

data/lib/wakame/runner/administrator_command.rb

@@ -197,21 +197,15 @@ module Wakame
       def self.included(klass)
         klass.class_eval {
           class << self
-            def command_name
+            def command_name(name=nil)
+              @command_name = name if name
               @command_name ||= Util.snake_case(self.to_s.split('::').last)
             end
 
-            def command_name=(name)
-              @command_name=name
-            end
-
-            def summary
+            def summary(str=nil)
+              @summary = str if str
               @summary
             end
-
-            def summary=(summary)
-              @summary=summary
-            end
           end
         }
       end
@@ -241,8 +235,8 @@ end
 class Wakame::Cli::Subcommand::LaunchCluster
   include Wakame::Cli::Subcommand
 
-  command_name = 'launch_cluster'
-  summary = "Start up the cluster"
+  command_name 'launch_cluster'
+  summary "Start up the cluster"
 
   def parse(args)
     create_parser(args) {|opts|
@@ -261,7 +255,7 @@ end
 class Wakame::Cli::Subcommand::ShutdownCluster
   include Wakame::Cli::Subcommand
 
-  summary = "Shutdown the cluster"
+  summary "Shutdown the cluster"
 
   def parse(args)
     create_parser(args) {|opts|
@@ -279,17 +273,81 @@ end
 class Wakame::Cli::Subcommand::Status
   include Wakame::Cli::Subcommand
 
-  summary = "Show summary status across the cluster"
+  summary "Show summary status across the cluster"
+
+  if Wakame.config.environment == :EC2
+    STATUS_TMPL = <<__E__
+<%- if cluster -%>
+Cluster : <%= cluster["name"].to_s %> (<%= cluster_status_msg(cluster["status"]) %>)
+<%- cluster["resources"].keys.each { |res_id|
+  resource = body["resources"][res_id]
+-%>
+  <%= resource["class_type"] %> : <current=<%= resource["instance_count"] %> min=<%= resource["min_instances"] %>, max=<%= resource["max_instances"] %><%= resource["require_agent"] ? "" : ", AgentLess" %>>
+  <%- resource["services_ref"].each { |svc| -%>
+     <%= svc["id"] %> (<%= svc_status_msg(svc["status"]) %>:<%= monitor_status_msg(svc["monitor_status"]) %>)
+  <%- } -%>
+<%- } -%>
+<%- if cluster["services"].size > 0  -%>
+
+Instances (<%= cluster["services"].size %>):
+  <%- cluster["services"].keys.each { |svc_id| 
+    svc = body["services"][svc_id]
+  -%>
+  <%= svc_id %> : <%= svc["resource_ref"]["class_type"] %> (<%= svc_status_msg(svc["status"]) %>:<%= monitor_status_msg(svc["monitor_status"]) %>)
+    <%- if svc["agent_ref"] -%>
+    On VM: <%= svc["agent_ref"]["id"] %>
+    <%- end -%>
+  <%- } -%>
+<%- end -%>
+<%- if cluster["cloud_hosts"].size > 0 -%>
+
+Cloud Host (<%= cluster["cloud_hosts"].size %>):
+  <%- cluster["cloud_hosts"].keys.each { |host_id| 
+    cloud_host = body["cloud_hosts"][host_id]
+  -%>
+  <%= host_id %> : <% if cloud_host["agent_id"] %>bind to <%= cloud_host["agent_id"] %><% end %>
+    <%- assigned_svcs = body['services'].values.find_all{|data| data['cloud_host_id'] == host_id } -%>
+    <%- if assigned_svcs.size > 0 -%>
+    Assigned: <%= body['services'].values.find_all{|data| data['cloud_host_id'] == host_id }.map{|data| data['resource_ref']['class_type'] }.join(', ')  %>
+    <%- end -%>
+  <%- } -%>
+<%- end -%>
+<%- else # if cluster -%>
+Cluster: 
+  No cluster data is loaded in master. (Run import_cluster_config first)
+<%- end # if cluster -%>
+
+<%- if agent_pool && agent_pool["group_active"].size > 0 -%>
+
+Agents (<%= agent_pool["group_active"].size %>):
+  <%- agent_pool["group_active"].each { |agent_id|
+  a = body["agents"][agent_id]
+  -%>
+  <%= a["id"] %> : <%= a["vm_attr"]["private_dns_name"] %>, <%= a["vm_attr"]["dns_name"] %>, <%= (Time.now - Time.parse(a["last_ping_at"])).to_i %> sec(s), placement=<%= a["vm_attr"]["aws_availability_zone"] %> (<%= agent_status_msg(a["status"]) %>)
+   <%- if a["reported_services"].size > 0 && !cluster["services"].empty? -%>
+    Services (<%= a["reported_services"].size %>): <%= a["reported_services"].keys.collect{ |svc_id|
+                body['services'][svc_id].nil? ? 'Unknown:' + svc_id[0,5] + '...' :  body["services"][svc_id]["resource_ref"]["class_type"]
+              }.join(', ') %>
+   <%- end -%>
+  <%- } -%>
+<%- else -%>
+
+Agents (0):
+.....
+  None of agents are observed.
+<%- end -%>
+__E__
 
-  STATUS_TMPL = <<__E__
+  else
+    STATUS_TMPL = <<__E__
 <%- if cluster -%>
 Cluster : <%= cluster["name"].to_s %> (<%= cluster_status_msg(cluster["status"]) %>)
 <%- cluster["resources"].keys.each { |res_id|
   resource = body["resources"][res_id]
 -%>
   <%= resource["class_type"] %> : <current=<%= resource["instance_count"] %> min=<%= resource["min_instances"] %>, max=<%= resource["max_instances"] %><%= resource["require_agent"] ? "" : ", AgentLess" %>>
-  <%- resource["services_ref"].each { |svc_inst| -%>
-     <%= svc_inst["id"] %> (<%= svc_status_msg(svc_inst["status"]) %>)
+  <%- resource["services_ref"].each { |svc| -%>
+     <%= svc["id"] %> (<%= svc_status_msg(svc["status"]) %>:<%= monitor_status_msg(svc["monitor_status"]) %>)
   <%- } -%>
 <%- } -%>
 <%- if cluster["services"].size > 0  -%>
@@ -298,7 +356,7 @@ Instances (<%= cluster["services"].size %>):
   <%- cluster["services"].keys.each { |svc_id| 
     svc = body["services"][svc_id]
   -%>
-  <%= svc_id %> : <%= svc["resource_ref"]["class_type"] %> (<%= svc_status_msg(svc["status"]) %>)
+  <%= svc_id %> : <%= svc["resource_ref"]["class_type"] %> (<%= svc_status_msg(svc["status"]) %>:<%= monitor_status_msg(svc["monitor_status"]) %>)
     <%- if svc["agent_ref"] -%>
     On VM: <%= svc["agent_ref"]["id"] %>
     <%- end -%>
@@ -311,29 +369,40 @@ Cloud Host (<%= cluster["cloud_hosts"].size %>):
     cloud_host = body["cloud_hosts"][host_id]
   -%>
   <%= host_id %> : <% if cloud_host["agent_id"] %>bind to <%= cloud_host["agent_id"] %><% end %>
+    <%- assigned_svcs = body['services'].values.find_all{|data| data['cloud_host_id'] == host_id } -%>
+    <%- if assigned_svcs.size > 0 -%>
+    Assigned: <%= body['services'].values.find_all{|data| data['cloud_host_id'] == host_id }.map{|data| data['resource_ref']['class_type'] }.join(', ')  %>
+    <%- end -%>
   <%- } -%>
 <%- end -%>
 <%- else # if cluster -%>
 Cluster: 
   No cluster data is loaded in master. (Run import_cluster_config first)
 <%- end # if cluster -%>
+
 <%- if agent_pool && agent_pool["group_active"].size > 0 -%>
 
 Agents (<%= agent_pool["group_active"].size %>):
-  <%- agent_pool["group_active"].keys.each { |agent_id|
+  <%- agent_pool["group_active"].each { |agent_id|
   a = body["agents"][agent_id]
   -%>
-  <%= a["id"] %> : <%= a["vm_attr"]["local_ipv4"] %>, <%= a["vm_attr"]["public_ipv4"] %>, <%= (Time.now - Time.parse(a["last_ping_at"])).to_i %> sec(s), placement=<%= a["vm_attr"]["availability_zone"] %> (<%= svc_status_msg(a["status"]) %>)
+  <%= a["id"] %> : <%= (Time.now - Time.parse(a["last_ping_at"])).to_i %> sec(s) (<%= agent_status_msg(a["status"]) %>)
    <%- if a["reported_services"].size > 0 && !cluster["services"].empty? -%>
-    Services (<%= a["reported_services"].size %>): <%= a["reported_services"].keys.collect{ |svc_id| body["services"][svc_id]["resource_ref"]["class_type"] }.join(', ') %>
+    Services (<%= a["reported_services"].size %>): <%= a["reported_services"].keys.collect{ |svc_id|
+                body['services'][svc_id].nil? ? 'Unknown:' + svc_id[0,5] + '...' :  body["services"][svc_id]["resource_ref"]["class_type"]
+              }.join(', ') %>
    <%- end -%>
   <%- } -%>
 <%- else -%>
 
 Agents (0):
+.....
   None of agents are observed.
 <%- end -%>
 __E__
+  end
+
+
 
   SVC_STATUS_MSG={
     Wakame::Service::STATUS_TERMINATE=>'Terminated',
@@ -347,7 +416,27 @@ __E__
     Wakame::Service::STATUS_RELOADING=>'Reloading...',
     Wakame::Service::STATUS_MIGRATING=>'Migrating...',
     Wakame::Service::STATUS_ENTERING=>'Entering...',
-    Wakame::Service::STATUS_QUITTING=>'Quitting...'
+    Wakame::Service::STATUS_QUITTING=>'Quitting...',
+    Wakame::Service::STATUS_RUNNING=>'Running'
+  }
+
+  SVC_MONITOR_STATUS_MSG={
+    Wakame::Service::STATUS_OFFLINE=>'Offline',
+    Wakame::Service::STATUS_ONLINE=>'Online',
+    Wakame::Service::STATUS_UNKNOWN=>'Unknown',
+    Wakame::Service::STATUS_FAIL=>'Fail'
+  }
+
+  AGENT_STATUS_MSG={
+    Wakame::Service::Agent::STATUS_END     => 'Terminated',
+    Wakame::Service::Agent::STATUS_INIT    => 'Initialized',
+    Wakame::Service::Agent::STATUS_OFFLINE => 'Offline',
+    Wakame::Service::Agent::STATUS_ONLINE  => 'Online',
+    Wakame::Service::Agent::STATUS_UNKNOWN => 'Unknown',
+    Wakame::Service::Agent::STATUS_TIMEOUT => 'Timedout',
+    Wakame::Service::Agent::STATUS_RUNNING => 'Running',
+    Wakame::Service::Agent::STATUS_REGISTERRING => 'Registerring...',
+    Wakame::Service::Agent::STATUS_TERMINATING  => 'Terminating...'
   }
 
   CLUSTER_STATUS_MSG={
@@ -381,11 +470,19 @@ __E__
 
   private
   def svc_status_msg(stat)
-    SVC_STATUS_MSG[stat]
+    SVC_STATUS_MSG[stat.to_i] || "Unknown Code: #{stat}"
+  end
+
+  def monitor_status_msg(stat)
+    SVC_MONITOR_STATUS_MSG[stat.to_i] || "Unknown Code: #{stat}"
+  end
+
+  def agent_status_msg(stat)
+    AGENT_STATUS_MSG[stat.to_i] || "Unknown Code: #{stat}"
   end
 
   def cluster_status_msg(stat)
-    CLUSTER_STATUS_MSG[stat]
+    CLUSTER_STATUS_MSG[stat.to_i] || "Unknown Code: #{stat}"
   end
 
   def map_ref_data(body)
@@ -700,3 +797,92 @@ __E__
     SVC_STATUS_MSG[stat]
   end
 end
+
+class Wakame::Cli::Subcommand::DeployApplication
+  include Wakame::Cli::Subcommand
+
+  def parse(args)
+    @params = {}
+    cmd = create_parser(args) { |opts|
+      opts.banner = "Usage: deploy_application [options] \"Application Name\""
+      opts.separator ""
+    }
+    @params[:app_name] = args.shift || abort("[ERROR]: Application name was not given")
+    @params
+  end
+
+  def run(requester)
+    requester.request(@params)
+  end
+
+end
+
+class Wakame::Cli::Subcommand::DeployConfig
+  include Wakame::Cli::Subcommand
+
+  command_name 'deploy_config'
+  summary "Deploy configuration files"
+
+  def parse(args)
+    create_parser(args) {|opts|
+      opts.banner = "Usage: deploy_config"
+      opts.separator ""
+      opts.separator "options:"
+    }
+  end
+
+  def run(requester)
+    requester.request()
+  end
+
+end
+
+class Wakame::Cli::Subcommand::Actor
+  include Wakame::Cli::Subcommand
+
+  summary 'Call actor method on an arbitrary agent.'
+
+  def parse(args)
+    @params = {}
+    cmd = create_parser(args) { |opts|
+      opts.banner = "Usage: actor [options] \"Agent ID\" \"/actor/path\" [\"args\"]"
+      opts.separator ""
+      opts.separator "options:"
+    }
+    @params[:agent_id] = args.shift || abort("[ERROR]: Agent ID was not given")
+    @params[:path] = args.shift || abort("[ERROR]: Path was not given")
+    @params[:args] = args.shift
+    @params
+  end
+
+  def run(requester)
+    requester.request(@params)
+  end
+
+end
+
+class Wakame::Cli::Subcommand::ControlService
+  include Wakame::Cli::Subcommand
+
+  def parse(args)
+    @params = {}
+    create_parser(args) {|opts|
+      opts.banner = 'Usage: control_service [options] "Resource Name" "Service ID" "Number"'
+      opts.separator('Options:')
+    }
+
+    raise "Unknown Resource Name: #{args}" unless args.size > 0
+    @params["resource"] = args.shift
+
+    raise "Unknown Service ID: #{args}" unless args.size > 0
+    @params[:service_id] = args.shift
+
+    raise "Unknown Number: #{args}" unless args.size > 0
+    @params[:number] = args.shift.to_i
+  end
+
+  def run(requester)
+    requester.request(@params)
+  end
+
+end