wakame 0.5.0 → 0.5.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.1 2009-11-22
+
+* Add deploy_application action.
+
 == 0.5.0 2009-09-18
 
 * Add Memcached resource.

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2009 axsh Co. Ltd.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/Rakefile

@@ -6,29 +6,28 @@ require 'rake/clean'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.name = "wakame"
     gem.summary = %q{A distributed service framework on top of Cloud environments.}
     gem.description = <<__END__
 __END__
-    gem.email = ["m-fujiwara@axsh.net"]
-    gem.homepage = "http://wakame.rubyforge.org/"
-    gem.authors = ["axsh co.,Ltd.", "Masahiro Fujiwara"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.rubyforge_project = 'wakame'
+    gem.email = ["info@axsh.net"]
+    gem.homepage = "http://wakame.axsh.jp/"
+    gem.authors = ["axsh Co. Ltd."]
     gem.executables = ['wakame']
-    [['amqp','>= 0.6.0'],
+    [['amqp','>= 0.6.5'],
      ['right_aws','>= 1.10.0'], # Ec2ELB works with 1.10.99 in their github.
-     ['eventmachine','>= 0.12.8'],
+     ['eventmachine','>= 0.12.10'],
      ['rake', '>= 0.8.7'],
      ['log4r', '>= 1.0.5'],
      ['daemons', '>= 1.0.10'],
      ['rubigen', '>= 1.5.2'],
-     ['open4', '>= 0.9.6'],
+     ['open4', '>= 1.0.0'],
      ['jeweler', '>= 1.0.0'],
      ['rack', '>= 1.0.0'],
-     ['thin', '>= 1.2.2'],
+     ['thin', '>= 1.2.5'],
      ['json', '>= 1.1.7'],
-     ['sequel', '>= 3.2.0']
+     ['sequel', '>= 3.6.0']
     ].each { |i|
       gem.add_dependency(i[0], i[1])
     }
@@ -41,9 +40,9 @@ __END__
                          'tasks/**/*',
                          'tests/**/*'].to_a
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/app_generators/wakame/templates/bin/wakame-agent

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/../config/boot'
 
-Wakame::Bootstrap.boot_agent!
+Wakame::Bootstrap.boot!
 
 require 'wakame/runner/agent'
 

data/app_generators/wakame/templates/bin/wakame-master

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/../config/boot'
 
-Wakame::Bootstrap.boot_master!
+Wakame::Bootstrap.boot!
 
 require 'wakame/runner/master'
 

data/app_generators/wakame/templates/config/cluster.rb

@@ -1,37 +1,45 @@
+Wakame.log.debug("WAKAME_CLUSTER_ENV=#{Wakame.config.cluster_env}")
+
+case Wakame.config.cluster_env
+when  'development'
+    ec2_elb_front_fqdn = 'www.d.example.com'
+    elb_name = ''
+when  'test'
+    ec2_elb_front_fqdn = 'www.t.example.com'
+    elb_name = ''
+when  'qa'
+    ec2_elb_front_fqdn = 'www.q.example.com'
+    elb_name = ''
+when  'production'
+    ec2_elb_front_fqdn = 'www.example.com'
+    elb_name = ''
+end
+
+
 define_cluster('WebCluster1') { |c|
-  c.add_resource(Apache_APP.new) { |r|
-    r.listen_port = 8001
-    r.max_instances = 5
-  }
-  c.add_resource(Nginx.new)
   c.add_resource(Ec2ELB.new) { |r|
-    r.elb_name = 'xxxxxxx'
+    r.elb_name = elb_name
+    r.just_unregister_when_stop = true
   }
-  c.add_resource(MySQL_Master.new) {|r|
-    r.mysqld_basedir = '/home/wakame/mysql'
-    r.ebs_volume = 'vol-xxxxxxx'
-    r.ebs_device = '/dev/sdm'
+  c.add_resource(Nginx.new) { |r|
+    r.max_instances = 5
+    r.ec2_elb_front_fqdn = ec2_elb_front_fqdn
+    # r.fcgi_enabled = true
   }
+  #c.add_resource(MySQL_Master.new) {|r|
+  #  r.mysqld_basedir = '/home/wakame/mysql'
+  #  r.ebs_volume = 'vol-xxxxxxx'
+  #  r.ebs_device = '/dev/sdm'
+  #}
   
-  c.set_dependency(Apache_APP, Nginx)
   c.set_dependency(Nginx, Ec2ELB)
-  c.set_dependency(MySQL_Master, Apache_APP)
+  #c.set_dependency(MySQL_Master, Nginx)
 
   host = c.add_cloud_host { |h|
     #h.vm_spec.availability_zone = 'us-east-1a'
   }
+
   c.propagate(Nginx, host.id)
-  c.propagate(Apache_APP, host.id)
-  c.propagate(MySQL_Master, host.id)
+  #c.propagate(MySQL_Master, host.id)
   c.propagate(Ec2ELB)
-
-  c.define_triggers {|r|
-    #r.register_trigger(Wakame::Triggers::MaintainSshKnownHosts.new)
-    #r.register_trigger(Wakame::Triggers::LoadHistoryMonitor.new)
-    #r.register_trigger(Wakame::Triggers::InstanceCountUpdate.new)
-    #r.register_trigger(Wakame::Triggers::ScaleOutWhenHighLoad.new)
-    #r.register_trigger(Wakame::Triggers::ShutdownUnusedVM.new)
-  }
-
 }
-

data/app_generators/wakame/templates/config/init.d/centos/wakame-agent

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+
+NAME=`basename $0`
+USER=wakame
+GROUP=wakame
+PIDFILE=/var/run/wakame/$NAME.pid
+
+. /etc/rc.d/init.d/functions
+[ -f /etc/default/wakame ] && {
+	. /etc/default/wakame
+	export WAKAME_ROOT WAKAME_ENV
+}
+
+DAEMON=$WAKAME_ROOT/bin/$NAME
+
+case "$1" in
+	start)
+		echo -n $"Starting $NAME: "
+		$DAEMON    $USER $OPTIONS && success || failure
+		RETVAL=$?
+		echo
+		;;
+	stop)
+		echo -n $"Stopping $NAME: "
+		kill `cat $PIDFILE`
+		RETVAL=$?
+		echo
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo $"Usage: $0 [start|stop|restart]"
+		RETVAL=1
+		;;
+esac
+exit $RETVAL

data/app_generators/wakame/templates/config/init.d/centos/wakame-master

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+
+NAME=`basename $0`
+USER=wakame
+GROUP=wakame
+PIDFILE=/var/run/wakame/$NAME.pid
+
+. /etc/rc.d/init.d/functions
+[ -f /etc/default/wakame ] && {
+	. /etc/default/wakame
+	export WAKAME_ROOT WAKAME_ENV
+}
+
+DAEMON=$WAKAME_ROOT/bin/$NAME
+
+case "$1" in
+	start)
+		echo -n $"Starting $NAME: "
+		$DAEMON -u $USER $OPTIONS && success || failure
+		RETVAL=$?
+		echo
+		;;
+	stop)
+		echo -n $"Stopping $NAME: "
+		kill `cat $PIDFILE`
+		RETVAL=$?
+		echo
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo $"Usage: $0 [start|stop|restart]"
+		RETVAL=1
+		;;
+esac
+exit $RETVAL

data/app_generators/wakame/templates/config/init.d/wakame-master

@@ -23,7 +23,7 @@ PIDFILE=/var/run/wakame/wakame-master.pid
 . /lib/lsb/init-functions
 if [ -z $WAKAME_ROOT ]; then
     [ -f /etc/default/wakame ] && . /etc/default/wakame
-    export GEM_HOME WAKAME_ROOT WAKAME_ENV
+    export GEM_HOME WAKAME_ROOT WAKAME_ENV WAKAME_CLUSTER_ENV
 fi
 
 start_master()

data/lib/ext/eventmachine.rb

@@ -35,7 +35,7 @@ module EventMachine
 
   # Redefine EM's threadpool
   def self.spawn_threadpool
-    until @threadpool.size == 20
+    until @threadpool.size == 30
       thread = Thread.new {
         loop {
           op, cback = *@threadqueue.pop
@@ -61,20 +61,20 @@ module EventMachine
 
     raise "Eventmachine is not ready to accept the next_tick() call." unless self.reactor_running?
 
-    @q ||= ::Queue.new
+    q = ::Queue.new
     time_start = ::Time.now
 
     self.next_tick {
     #self.add_timer(0) {
       begin
         res = blk.call
-        @q << [true, res]
+        q << [true, res]
       rescue => e
-        @q << [false, e]
+        q << [false, e]
       end
     }
     
-    res = @q.shift
+    res = q.shift
     time_elapsed = ::Time.now - time_start
     Wakame.log.debug("EM.barrier: elapsed time for #{blk}: #{time_elapsed} sec (#{$eventmachine_library})") if time_elapsed > 0.05
     if res[0] == false && res[1].is_a?(Exception)