auser-poolparty 0.2.26 → 0.2.35

data/Manifest.txt

@@ -8,6 +8,7 @@ bin/cloud
 bin/cloud-add-keypair
 bin/cloud-configure
 bin/cloud-contract
+bin/cloud-ensure-provisioning
 bin/cloud-expand
 bin/cloud-list
 bin/cloud-maintain
@@ -18,6 +19,7 @@ bin/cloud-run
 bin/cloud-ssh
 bin/cloud-start
 bin/cloud-terminate
+bin/messenger-get-load
 bin/pool
 bin/pool-console
 bin/pool-describe
@@ -47,6 +49,7 @@ lib/erlang/messenger/Makefile
 lib/erlang/messenger/README
 lib/erlang/messenger/Rakefile
 lib/erlang/messenger/control
+lib/erlang/messenger/ebin/erl_crash.dump
 lib/erlang/messenger/ebin/master.app
 lib/erlang/messenger/ebin/master_app.beam
 lib/erlang/messenger/ebin/node.app
@@ -54,8 +57,9 @@ lib/erlang/messenger/ebin/node_app.beam
 lib/erlang/messenger/ebin/packager.app
 lib/erlang/messenger/ebin/pm_client.beam
 lib/erlang/messenger/ebin/pm_cluster.beam
-lib/erlang/messenger/ebin/pm_event_handler.beam
+lib/erlang/messenger/ebin/pm_event_manager.beam
 lib/erlang/messenger/ebin/pm_master.beam
+lib/erlang/messenger/ebin/pm_master_event_handler.beam
 lib/erlang/messenger/ebin/pm_master_rel-0.1.rel
 lib/erlang/messenger/ebin/pm_master_supervisor.beam
 lib/erlang/messenger/ebin/pm_node.beam
@@ -64,6 +68,7 @@ lib/erlang/messenger/ebin/pm_node_supervisor.beam
 lib/erlang/messenger/ebin/pm_packager.beam
 lib/erlang/messenger/ebin/utils.beam
 lib/erlang/messenger/erl_crash.dump
+lib/erlang/messenger/include/defines.hrl
 lib/erlang/messenger/lib/eunit/AUTHORS
 lib/erlang/messenger/lib/eunit/CHANGELOG
 lib/erlang/messenger/lib/eunit/COPYING
@@ -119,21 +124,26 @@ lib/erlang/messenger/lib/eunit/src/eunit_tty.erl
 lib/erlang/messenger/lib/eunit/src/file_monitor.erl
 lib/erlang/messenger/lib/eunit/sys.config
 lib/erlang/messenger/lib/eunit/vsn.mk
+lib/erlang/messenger/pm_master.beam
 lib/erlang/messenger/pm_master_rel-0.1.boot
 lib/erlang/messenger/pm_master_rel-0.1.script
+lib/erlang/messenger/pm_node.beam
 lib/erlang/messenger/pm_node_rel-0.1.boot
 lib/erlang/messenger/pm_node_rel-0.1.script
 lib/erlang/messenger/src/master_app.erl
 lib/erlang/messenger/src/node_app.erl
 lib/erlang/messenger/src/pm_client.erl
 lib/erlang/messenger/src/pm_cluster.erl
-lib/erlang/messenger/src/pm_event_handler.erl
+lib/erlang/messenger/src/pm_event_manager.erl
 lib/erlang/messenger/src/pm_master.erl
+lib/erlang/messenger/src/pm_master_event_handler.erl
 lib/erlang/messenger/src/pm_master_supervisor.erl
 lib/erlang/messenger/src/pm_node.erl
 lib/erlang/messenger/src/pm_node_supervisor.erl
 lib/erlang/messenger/src/pm_packager.erl
 lib/erlang/messenger/src/utils.erl
+lib/erlang/messenger/useful_snippets
+lib/erlang/messenger/utils.beam
 lib/poolparty.rb
 lib/poolparty/base_packages/haproxy.rb
 lib/poolparty/base_packages/heartbeat.rb
@@ -230,6 +240,7 @@ lib/poolparty/templates/haresources
 lib/poolparty/templates/namespaceauth.conf
 lib/poolparty/templates/poolparty.monitor
 lib/poolparty/templates/puppet.conf
+lib/poolparty/templates/puppetcleaner
 lib/poolparty/version.rb
 lib/poolpartycl.rb
 poolparty.gemspec

data/PostInstall.txt

@@ -7,7 +7,8 @@ To get started, run the generator:
 Please check out the documentation for any questions or check out the google groups at
   http://groups.google.com/group/poolpartyrb
 
-Tutorials are at http://poolpartyrb.com
+More tutorials can be found at 
+  http://poolpartyrb.com
 
 Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs!
 

data/Rakefile

@@ -16,7 +16,7 @@ task :clean_pkg do |t|
   end
 end
 desc "Generate gemspec"
-task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :local_deploy, :clean_pkg] do |t|
+task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :local_deploy] do |t|
   res = %x[rake debug_gem]
   res = res.split("\n")[1..-1].join("\n")
   ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f|
@@ -25,7 +25,7 @@ task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :local_deploy, :clean
 end
 
 desc "Generate gemspec for github"
-task :gh => [:gemspec] do
+task :gh => [:gemspec, :ghgem] do
   filepath = ::File.join(::File.dirname(__FILE__), "poolparty.gemspec")
   data = open(filepath).read
   spec = eval("$SAFE = 3\n#{data}")
@@ -33,4 +33,10 @@ task :gh => [:gemspec] do
   File.open(filepath, "w+") do |f|
     f << yml
   end
+end
+
+desc "Generate github gemspec and latest gem"
+task :ghgem => [:local_deploy] do
+  `mv #{::File.expand_path(::File.dirname(__FILE__))}/pkg/*.gem #{::File.expand_path(::File.dirname(__FILE__))}/pkg/poolparty-latest.gem`
+  `git add pkg/poolparty-latest.gem -f`
 end

data/bin/cloud-contract

@@ -12,12 +12,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-begin
-  @cloud = cloud(o.cloudname.downcase.to_sym)
-rescue
-  puts "Cloud name required. Please specify it with -n name"
-  exit(0)
-end
+@cloud = extract_cloud_from_options(o).first
 
 with_cloud(@cloud, {:testing => @testing}) do
   puts header("Contracting cloud #{name}")

data/bin/cloud-ensure-provisioning

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+available_monitors = PoolParty::Monitors.available_monitors
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
+  opts.on('-l', '--no-shell', 'No shell') {optioner.noshell true}
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+include Remote
+
+@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@hostname = o.hostname ? o.hostname : `hostname`.chomp
+
+@hostname = "node0" if @hostname == "master" # Quick fix to make sure we have a node running on the master as well
+
+@clouds.each do |name, cloud|
+  
+  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
+    # TODO: Change this to be app specfic
+    # SECURITY RISK
+    
+    boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
+    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
+    
+    Kernel.system command
+  end  
+  
+end

data/bin/cloud-expand

@@ -12,12 +12,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-begin
-  @cloud = cloud(o.cloudname.downcase.to_sym)
-rescue
-  puts "Cloud name required. Please specify it with -n name"
-  exit(0)
-end
+@cloud = extract_cloud_from_options(o).first
 
 with_cloud(@cloud, {:testing => @testing}) do
   puts header("Expanding cloud #{name}")

data/bin/cloud-provision

@@ -4,28 +4,36 @@ require "poolparty"
 require "poolpartycl"
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-s', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.num i }
 end
 
 load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
+@clouds = extract_cloud_from_options o
+@instance_num = o.num.to_i || nil
 
-@clouds.each do |name, cloud|
-  
-  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_slave => o.provision_slave, :provision_master => true}) do
-    
-    provisioning_in_progress
+@clouds.each do |cloud|
+
+  with_cloud(cloud, {:verbose => o.verbose, :testing => o.testing, :provision_slave => (o.provision_slave || false), :instance_num => @instance_num}) do
     
-    Provisioner.provision_master(self, testing) if provision_master
-    Provisioner.provision_slaves(self, testing) if provision_slave
-    # if provision_class == "master" || provision_class == "all"    
-    # end
+    if instance_num      
+      @instance = get_instance_by_number( instance_num )
+      vputs "Provisioning instance: #{@instance.name} (#{instance_num})"
+      Provisioner.provision_slave(@instance, self, testing)
+    else
+      if provision_slave
+        vputs "Provisioning slaves"
+        Provisioner.provision_slaves(self, testing)
+      else
+        vputs "Provisioning master"
+        provisioning_in_progress
+        verbose ? Provisioner.provision_master(self, testing) : hide_output { Provisioner.provision_master(self, testing) }
+        provisioning_complete
+      end
+    end
     
-    provisioning_complete
+  end
 
-    clear_base_directory unless testing
-  end    
 end

data/bin/cloud-start

@@ -23,6 +23,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
         puts("\tNot launching while in testing mode")
       else
         provisioning_in_progress
+        vputs "Launching and configuring the master"
         launch_and_configure_master!
         provisioning_complete
       end

data/bin/messenger-get-load

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+available_monitors = PoolParty::Monitors.available_monitors
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-m name', '--monitor monitor_name', "Monitor name (default: cpu) (Available monitors: #{available_monitors.join(", ")})") {|c| optioner.monitorname c}
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+include Remote
+
+@clouds = extract_cloud_from_options o
+@monitor = o.monitorname || "cpu"
+
+@clouds.each do |cl|
+  
+  with_cloud(cl, {:testing => o.testing, :monitorname => @monitor }) do
+    vputs "Getting #{monitorname} load through the messenger"
+    print PoolParty::Messenger.messenger_send!("get_load #{monitorname}", testing)
+  end
+  
+end

data/bin/server-build-messenger

@@ -5,15 +5,22 @@ require "poolpartycl"
 
 root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__), "..", "lib/erlang/messenger") )
 
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+end
+
 INCLUDE = "include"
 ERLC_FLAGS = "-I#{INCLUDE}"
 @version = "0.1"
 
 # erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell
+# erlc -pa ./ebin -o ebin ./src/*.erl
+# erl -pa ./ebin -s pm_packager start -s init stop
 cmd =<<-EOE
   cd #{root_dir}
-  erlc -pa ./ebin -o ebin ./src/*.erl
-  erl -pa ./ebin -s pm_packager start -s init stop
+  rake build_boot_scripts
 EOE
 
+vputs "** Building messenger **", o
+vputs "Running command #{cmd.runnable}", o
+
 out = %x[#{cmd.runnable}]

data/bin/server-fire-cmd

@@ -11,4 +11,4 @@ end
 
 @command = o.command if o.command
 
-puts %x[#{@command}].chomp
+print %x[#{@command}].chomp

data/bin/server-get-load

@@ -13,17 +13,17 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@clouds = extract_cloud_from_options o
 @monitor = o.monitorname ? o.monitorname : "cpu"
 
-@clouds.each do |name, cloud|
+@clouds.each do |cl|
   
-  with_cloud(cloud, {:testing => o.testing, :monitorname => @monitor }) do
+  with_cloud(cl, {:testing => o.testing, :monitorname => @monitor }) do
     if PoolParty::Monitors.available_monitors.include?(monitorname.downcase.to_sym)
       print "PoolParty::Monitors::#{monitorname.capitalize}Monitor".constantize.run
     else
       puts "Unknown monitor"
     end
-  end  
+  end
   
 end

data/bin/server-list-active

@@ -14,9 +14,9 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@clouds = extract_cloud_from_options o
 
-@clouds.each do |name, cloud|
+@clouds.each do |cloud|
   
   with_cloud(cloud, {:location => @location, :ctype => @ctype}) do
     puts "#{list_of_running_instances.map{|a| "#{a.send ctype}" }.join("\t")}"

data/bin/server-rerun

@@ -11,12 +11,12 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@clouds = extract_cloud_from_options o
 
-@clouds.each do |name, cloud|
+@clouds.each do |cl|
   
-  with_cloud(cloud, {:testing => o.testing}) do
-    cmd = master.puppet_runner_command
+  with_cloud(cl, {:testing => o.testing}) do
+    cmd = PoolParty::Remote::RemoteInstance.puppet_runner_command
     %x[#{cmd}] unless testing
     puts cmd
   end  

data/bin/server-start-master

@@ -12,18 +12,18 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@clouds = extract_cloud_from_options o
 
-@clouds.each do |name, cloud|
+@clouds.each do |cloud|
   
   with_cloud(cloud, {:testing => o.testing, :verbose => o.verbose }) do
     
     boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
     command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
     
-    puts "Running #{command}" if verbose
+    vputs "Running #{command}"
     
-    Kernel.system command
+    Kernel.system "exec #{command}" unless testing
   end  
   
 end

data/bin/server-start-node

@@ -13,12 +13,12 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 @hostname = o.hostname ? o.hostname : `hostname`.chomp
-
 @hostname = "node0" if @hostname == "master" # Quick fix to make sure we have a node running on the master as well
 
-@clouds.each do |name, cloud|
+@clouds = extract_cloud_from_options o
+
+@clouds.each do |cloud|
   
   with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
     # TODO: Change this to be app specfic
@@ -27,7 +27,7 @@ include Remote
     boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
     command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
     
-    Kernel.system command
+    Kernel.system "exec #{command}" unless testing
   end  
   
 end

data/lib/erlang/messenger/Rakefile

@@ -14,6 +14,12 @@ rule ".beam" =>  ["%{ebin,src}X.erl"] do |t|
 end
 
 task :compile => ['ebin'] + OBJ
+task :dcompile do
+  Dir["#{::File.dirname(__FILE__)}/src/*.erl"].each do |t|
+    Kernel.system "erlc -pa ebin -W #{ERLC_FLAGS} -Ddebug -o ebin #{t}"
+  end  
+end
+
 task :default => :compile
 
 task :run_tests => [:compile] do

data/lib/erlang/messenger/ebin/master.app

@@ -5,7 +5,7 @@
 		% Version
 		{vsn, "0.1"},
 		% All modules used by the application.  
-		{modules, [master_app, pm_master, pm_master_supervisor, utils]},
+		{modules, [master_app, pm_master, pm_master_supervisor, utils, pm_event_manager, pm_master_event_handler]},
 		% All the registered names in the application
 		{registered, [pm_master, pm_master_supervisor]},
 		% These must be started for application to run

data/lib/erlang/messenger/ebin/node.app

@@ -5,7 +5,7 @@
 		% Version
 		{vsn, "0.1"},
 		% All modules used by the application.  
-		{modules, [node_app, pm_node, pm_node_supervisor, utils]},
+		{modules, [node_app, pm_node, pm_node_supervisor, utils, pm_event_manager]},
 		% All the registered names in the application
 		{registered, [pm_node, pm_node_supervisor]},
 		% These must be started for application to run