wakame 0.5.0 → 0.5.1

data/tests/test_service.rb

@@ -144,21 +144,27 @@ class TestService < Test::Unit::TestCase
 
 
   def test_vmspec
+    spec = VmSpec.define {
+      environment(:EC2) { |ec2|
+        ec2.instance_type = 'm1.small'
+        ec2.availability_zone = 'us-east-c1'
+        ec2.security_groups << 'default'
+      }
+      
+      environment(:StandAlone) {
+      }
+    }
 
-    Wakame.config.vm_environment = :EC2
-    assert_equal(VmSpec::EC2, VmSpec.current.class)
 
+    Wakame.config.vm_environment = :EC2
+    p spec.current.attrs
     Wakame.config.vm_environment = :StandAlone
-    assert_equal(VmSpec::StandAlone, VmSpec.current.class)
+    p spec.current.attrs
 
     assert_raise(RuntimeError) {
       Wakame.config.vm_environment = :EC3
-      VmSpec.current
+      spec.current.attrs
     }
-
-    Wakame.config.vm_environment = :EC2
-    spec = VmSpec.current
-    spec
   end
 
 

data/tests/test_status_db.rb

@@ -6,6 +6,8 @@ require 'setup_master.rb'
 
 Wakame.config.status_db_dsn = 'sqlite:///'
 
+Wakame::Initializer.run(:setup_database)
+
 class TestStatusDB < Test::Unit::TestCase
 
   class Model1 < Wakame::StatusDB::Model

data/tests/test_util.rb

@@ -12,7 +12,7 @@ class TestUtilClass < Test::Unit::TestCase
     include AttributeHelper
     
     def_attribute :a, 1
-    def_attribute :b, 2
+    def_attribute :b, {:default=>2, :persistent=>true}
     def_attribute :c, []
     attr :m
     attr_accessor :n, :o
@@ -26,6 +26,11 @@ class TestUtilClass < Test::Unit::TestCase
     def_attribute :f
   end
 
+  class C < B
+    update_attribute :b, {:a=>1, :b=>1}
+    update_attribute :d, {:a=>1, :b=>1}
+  end
+
   def test_attribute_helper1
     a = A.new
     assert_equal(1, a.a)
@@ -45,6 +50,12 @@ class TestUtilClass < Test::Unit::TestCase
   end
 
 
+  def test_attribute_helper2
+    c = C.new
+    assert_equal({:default=>{:a=>1, :b=>1}, :persistent=>true}, C.get_attr_attribute(:b))
+    assert_equal({:default=>{:a=>1, :b=>1}}, C.get_attr_attribute(:d))
+  end
+
 
   H={23=>1, 38=>3, 2837=>1, 3727=>4, 937=>1, 184=>5, 328=>2, 8939=>1}
   def test_sorted_hash1

data/wakame_generators/resource/templates/apache_app/apache_app.rb

@@ -2,8 +2,12 @@ class Apache_APP < Wakame::Service::Resource
   include HttpServer
   include HttpApplicationServer
 
-  def_attribute :listen_port, {:default=>8001}
-  def_attribute :listen_port_https, {:default=>443}
+  update_attribute :listen_port, 8001
+  update_attribute :monitors, {'/service' => {
+      :type => :pidfile,
+      :path => '/var/run/apache2-app.pid'
+    }
+  }
 
   def render_config(template)
     template.glob_basedir(%w(conf/envvars-app init.d/apache2-app)) { |d|
@@ -15,6 +19,13 @@ class Apache_APP < Wakame::Service::Resource
     template.chmod("init.d/apache2-app", 0755)
   end
 
+  def on_reload_application(svc, action, repo_data)
+    action.actor_request(svc.cloud_host.agent_id, '/system/touch',
+                         File.join(application_root_path, repo_data[:app_name], 'current', 'tmp', 'restart.txt')
+                         ).request.wait
+  end
+
+
 
   def start(svc, action)
     cond = ConditionalWait.new { |cond|
@@ -23,13 +34,12 @@ class Apache_APP < Wakame::Service::Resource
       }
     }
 
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/service_monitor/register', svc.id, :pidfile, '/var/run/apache2-app.pid').request
     action.actor_request(svc.cloud_host.agent_id,
                          '/daemon/start', "apache_app", 'init.d/apache2-app'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process started")
     }
+    
     cond.wait
   end
   
@@ -40,22 +50,21 @@ class Apache_APP < Wakame::Service::Resource
         event.instance_id == svc.id
       }
     }
-
+    
     request = action.actor_request(svc.cloud_host.agent_id,
                                    '/daemon/stop', 'apache_app', 'init.d/apache2-app'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process stopped")
     }
     cond.wait
-
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/service_monitor/unregister', svc.id ).request
   end
 
   def reload(svc, action)
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/daemon/reload', "apache_app", 'init.d/apache2-app').request
-    request.wait
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/reload', "apache_app", 'init.d/apache2-app'){ |req|
+      req.wait
+      Wakame.log.debug("#{self.class} process reloaded")
+    }
   end
 
 end

data/wakame_generators/resource/templates/apache_app/conf/vh/aaa.test.conf

@@ -1,6 +1,6 @@
 <VirtualHost *:<%= resource.listen_port %>>
 ServerName aaa.test
-DocumentRoot /home/wakame/apps/development/test/public
+DocumentRoot <%= resource.application_root_path %>/aaa.test/current/public
 RailsEnv development
 
 LogLevel warn

data/wakame_generators/resource/templates/apache_lb/apache_lb.rb

@@ -1,8 +1,13 @@
 class Apache_LB < Wakame::Service::Resource
   include HttpServer
   
-  property :listen_port, {:default=>80}
-  property :listen_port_https, {:default=>443}
+  update_attribute :listen_port, 80
+  update_attribute :listen_port_https, 443
+  update_attribute :monitors, {'/service' => {
+      :type => :pidfile,
+      :path => '/var/run/apache2-lb.pid'
+    }
+  }
   
   def render_config(template)
     template.glob_basedir(%w(conf/envvars-lb init.d/apache2-lb)) { |d|
@@ -27,8 +32,6 @@ class Apache_LB < Wakame::Service::Resource
       }
     }
 
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/service_monitor/register', svc.id, :pidfile, '/var/run/apache2-lb.pid').request
     action.actor_request(svc.cloud_host.agent_id,
                          '/daemon/start', "apache_lb", 'init.d/apache2-lb'){ |req|
       req.wait
@@ -52,9 +55,6 @@ class Apache_LB < Wakame::Service::Resource
     }
 
     cond.wait
-
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/service_monitor/unregister', svc.id ).request
   end
 
   def reload(svc, action)

data/wakame_generators/resource/templates/apache_lb/conf/system-lb.conf

@@ -75,15 +75,17 @@ Listen <%= resource.listen_port %>
 #</IfModule>
 
 <Proxy balancer://cluster-www>
-  <%- service_cluster.each_instance(HttpAssetServer) { |n| 
-        next if n.status != STATUS_ONLINE
+  <%- cluster.each_instance(HttpAssetServer) { |n| 
+        #next if n.status == STATUS_RELOADING || !n.cloud_host.mapped?
+	next unless n.monitor_status == STATUS_ONLINE
   -%>
   BalancerMember http://<%= n.cloud_host.agent_ip %>:<%= n.resource.listen_port %> loadfactor=10
   <%- } -%>
 </Proxy>
 <Proxy balancer://cluster-app>
-  <%- service_cluster.each_instance(HttpApplicationServer) { |n|
-        next if n.status != STATUS_ONLINE
+  <%- cluster.each_instance(HttpApplicationServer) { |n|
+        #next if n.status == STATUS_RELOADING || !n.cloud_host.mapped?
+	next unless n.monitor_status == STATUS_ONLINE
   -%>
   BalancerMember http://<%= n.cloud_host.agent_ip %>:<%= n.resource.listen_port %> loadfactor=10
   <%- } -%>

data/wakame_generators/resource/templates/apache_www/apache_www.rb

@@ -2,7 +2,12 @@ class Apache_WWW < Wakame::Service::Resource
   include HttpServer
   include HttpAssetServer
 
-  property :listen_port, {:default=>8000}
+  update_attribute :listen_port, 8000
+  update_attribute :monitors, {'/service' => {
+      :type => :pidfile,
+      :path => '/var/run/apache2-www.pid'
+    }
+  }
   
   def render_config(template)
     template.glob_basedir(%w(conf/envvars-www init.d/apache2-www)) { |d|
@@ -21,10 +26,8 @@ class Apache_WWW < Wakame::Service::Resource
       }
     }
 
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/service_monitor/register', svc.id, :pidfile, '/var/run/apache2-www.pid').request
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/daemon/start', "apache_www", 'init.d/apache2-www'){ |req|
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/start', "apache_www", 'init.d/apache2-www'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process started")
     }
@@ -38,21 +41,20 @@ class Apache_WWW < Wakame::Service::Resource
       }
     }
 
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/daemon/stop', 'apache_www', 'init.d/apache2-www'){ |req|
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/stop', 'apache_www', 'init.d/apache2-www'){ |req|
       req.wait
       Wakame.log.debug("#{self.class} process stooped")
     }
     cond.wait
-
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/service_monitor/unregister', svc.id ).request
   end
   
   def reload(svc, action)
-    request = action.actor_request(svc.cloud_host.agent_id,
-                                   '/daemon/reload', 'apache_www', 'init.d/apache2-www').request
-    request.wait
+    action.actor_request(svc.cloud_host.agent_id,
+                         '/daemon/reload', 'apache_www', 'init.d/apache2-www'){ |req|
+      req.wait
+      Wakame.log.debug("#{self.class} process reloaded")
+    }
   end
   
 end

data/wakame_generators/resource/templates/ec2_elastic_ip/ec2_elastic_ip.rb

@@ -1,7 +1,8 @@
 class Ec2ElasticIp < Wakame::Service::Resource
   
   property :elastic_ip
-  property :require_agent, false
+  property :disassociate_ip, {:default=>true}
+  update_attribute :require_agent, false
   
   def on_parent_changed(svc, action)
     start(svc, action)
@@ -13,25 +14,24 @@ class Ec2ElasticIp < Wakame::Service::Resource
 
     a = svc.parent_instances.first
 
-    Wakame.log.info("Associating the Elastic IP #{self.elastic_ip} to #{a.cloud_host.agent.vm_attr[:instance_id]}")
-    ec2.associate_address(a.cloud_host.agent.vm_attr[:instance_id], self.elastic_ip)
-    EM.barrier {
-      svc.update_status(Wakame::Service::STATUS_ONLINE)
-    }
+    Wakame.log.info("Associating the Elastic IP #{self.elastic_ip} to #{a.cloud_host.agent.vm_attr[:aws_instance_id]}")
+    ec2.associate_address(a.cloud_host.agent.vm_attr[:aws_instance_id], self.elastic_ip)
+
+    svc.update_monitor_status(Wakame::Service::STATUS_ONLINE)
   end
   
   def stop(svc, action)
-    require 'right_aws'
-    ec2 = RightAws::Ec2.new(Wakame.config.aws_access_key, Wakame.config.aws_secret_key)
-
-    a = svc.parent_instances.first
-
-    Wakame.log.info("Disassociating the Elastic IP #{self.elastic_ip} from #{a.cloud_host.agent.vm_attr[:instance_id]}")
-    ec2.disassociate_address(self.elastic_ip)
-    EM.barrier {
-      svc.update_status(Wakame::Service::STATUS_OFFLINE)
-    }
-
+    if self.disassociate_ip
+      require 'right_aws'
+      ec2 = RightAws::Ec2.new(Wakame.config.aws_access_key, Wakame.config.aws_secret_key)
+      
+      a = svc.parent_instances.first
+      
+      Wakame.log.info("Disassociating the Elastic IP #{self.elastic_ip} from #{a.cloud_host.agent.vm_attr[:aws_instance_id]}")
+      ec2.disassociate_address(self.elastic_ip)
+    end
+    
+    svc.update_monitor_status(Wakame::Service::STATUS_OFFLINE)
   end
 
 end

data/wakame_generators/resource/templates/ec2_elb/ec2_elb.rb

@@ -1,8 +1,8 @@
 class Ec2ELB < Wakame::Service::Resource
   
   property :elb_name
-  property :require_agent, false
   property :just_unregister_when_stop, false
+  update_attribute :require_agent, false
   
   def on_parent_changed(svc, action)
     start(svc, action)
@@ -13,8 +13,8 @@ class Ec2ELB < Wakame::Service::Resource
 
     parents = svc.parent_instances.dup
 
-    vm_slice_ids = parents.collect{|a| a.cloud_host.agent.vm_attr[:instance_id] }.uniq
-    av_zones = parents.collect{|a| a.cloud_host.agent.vm_attr[:availability_zone] }.uniq
+    vm_slice_ids = parents.collect{|a| a.cloud_host.agent.vm_attr[:aws_instance_id] if a.cloud_host.mapped? }.uniq.compact
+    av_zones = parents.collect{|a| a.cloud_host.agent.vm_attr[:aws_availability_zone] if a.cloud_host.mapped? }.uniq.compact
     Wakame.log.info("Setting up the ELB #{self.elb_name} with #{vm_slice_ids.join(', ')}")
     begin
       res = elb.describe_load_balancers(self.elb_name)
@@ -32,15 +32,25 @@ class Ec2ELB < Wakame::Service::Resource
       res = elb.describe_load_balancers(self.elb_name)
       elbdesc = res[0]
     end
+    Wakame.log.info("Registerd the ELB #{self.elb_name} as #{elbdesc[:dns_name]}")
 
-    elb_members, elb_not_members = vm_slice_ids.partition{|i| elbdesc[:instances].member?(i) }
-    unless elb_not_members.empty?
-      elb.register_instances_with_load_balancer(self.elb_name, *elb_not_members)
+    elb.enable_availability_zones_for_load_balancer(elb_name, av_zones)
+
+    elbdesc[:stripped_instances] = elbdesc[:instances].map { |i| i.strip }
+    needless_ids = elbdesc[:stripped_instances] - vm_slice_ids
+
+    unless needless_ids.empty?
+      elb.deregister_instances_with_load_balancer(elb_name, needless_ids)
     end
+    elb.register_instances_with_load_balancer(elb_name, vm_slice_ids)
 
-    EM.barrier {
-      svc.update_status(Wakame::Service::STATUS_ONLINE)
-    }
+    current_av_zones = elbdesc[:availability_zones].map { |av_zone| av_zone }
+    needless_av_zones = current_av_zones - av_zones
+    unless needless_av_zones.empty?
+      elb.disable_availability_zones_for_load_balancer(elb_name, needless_av_zones)
+    end
+
+    svc.update_monitor_status(Wakame::Service::STATUS_ONLINE)
   end
   
   def stop(svc, action)
@@ -48,10 +58,10 @@ class Ec2ELB < Wakame::Service::Resource
 
     if self.just_unregister_when_stop
       parents = svc.parent_instances.dup
-      vm_slice_ids = parents.collect{|a| a.cloud_host.agent.vm_attr[:instance_id] }.uniq
+      vm_slice_ids = parents.collect{|a| a.cloud_host.agent.vm_attr[:aws_instance_id] if a.cloud_host.mapped? }.uniq.compact
       Wakame.log.info("Deregistering the VM instances (#{vm_slice_ids.join(', ')}) from ELB #{self.elb_name}")
 
-      elb.deregister_instances_with_load_balancer(self.elb_name, *vm_slice_id)
+      elb.deregister_instances_with_load_balancer(self.elb_name, *vm_slice_ids)
     else
       Wakame.log.info("Destroying the ELB #{self.elb_name}.")
       # Ignore errors in case of any issues.
@@ -62,10 +72,7 @@ class Ec2ELB < Wakame::Service::Resource
       end
     end
 
-    EM.barrier {
-      svc.update_status(Wakame::Service::STATUS_OFFLINE)
-    }
-
+    svc.update_monitor_status(Wakame::Service::STATUS_OFFLINE)
   end
 
   private

data/wakame_generators/resource/templates/mongodb/conf/mongodb.conf

@@ -0,0 +1,95 @@
+# mongodb.conf
+
+# Where to store the data.
+
+# Note: if you run mongodb as a non-root user (recommended) you may
+# need to create and set permissions for this directory manually,
+# e.g., if the parent directory isn't mutable by the mongodb user.
+#dbpath=<%= resource.dbpath %>
+
+#where to log
+#logpath=<%= resource.logpath %>
+
+logappend=true
+
+port=<%= resource.port %>
+
+
+
+# Enables periodic logging of CPU utilization and I/O wait
+#cpu = true
+
+# Turn on/off security.  Off is currently the default
+#noauth = true
+#auth = true
+
+# Verbose logging output.
+#verbose = true
+
+# Inspect all client data for validity on receipt (useful for
+# developing drivers)
+#objcheck = true
+
+# Enable db quota management
+#quota = true
+
+# Set oplogging level where n is
+#   0=off (default)
+#   1=W
+#   2=R
+#   3=both
+#   7=W+some reads
+#oplog = 0
+
+# Diagnostic/debugging option
+#nocursors = true
+
+# Ignore query hints
+#nohints = true
+
+# Disable the HTTP interface (Defaults to localhost:27018).
+#nohttpinterface = true
+
+# Turns off server-side scripting.  This will result in greatly limited
+# functionality
+#noscripting = true
+
+# Turns off table scans.  Any query that would do a table scan fails.
+#notablescan = true
+
+# Disable data file preallocation.
+#noprealloc = true
+
+# Specify .ns file size for new databases.
+# nssize = <size>
+
+# Accout token for Mongo monitoring server.
+#mms-token = <token>
+
+# Server name for Mongo monitoring server.
+#mms-name = <server-name>
+
+# Ping interval for Mongo monitoring server.
+#mms-interval = <seconds>
+
+# Replication Options
+
+# in replicated mongo databases, specify here whether this is a slave or master
+#slave = true
+#source = master.example.com
+# Slave only: specify a single database to replicate
+#only = master.example.com
+# or
+#master = true
+#source = slave.example.com
+
+# Address of a server to pair with.
+#pairwith = <server:port>
+# Address of arbiter server.
+#arbiter = <server:port>
+# Automatically resync if slave data is stale
+#autoresync
+# Custom size for replication operation log.
+#oplogSize = <MB>
+# Size limit for in-memory storage of op ids.
+#opIdMem = <bytes>