auser-poolparty 0.0.9 → 0.1.0

data/lib/poolparty/application.rb

@@ -10,12 +10,12 @@ module PoolParty
       # The application options
       def options(opts={})
         @options ||= make_options(opts)        
-      end      
+      end
       # Make the options with the config_file overrides included
       # Default config file assumed to be at config/config.yml
       def make_options(opts={})
         loading_options = opts.delete(:optsparse) || {}
-        loading_options.merge!( {:argv => opts.delete(:argv)} )
+        loading_options.merge!( opts.delete(:argv) || {} )
         
         config_file_location = (default_options[:config_file] || opts[:config_file])        
         # If the config_file options are specified and not empty
@@ -29,7 +29,7 @@ module PoolParty
         
         default_options.merge!(opts)
         load_options!(loading_options) # Load command-line options        
-        default_options.merge!(local_user_data) unless local_user_data == {}
+        default_options.merge!(local_user_data) unless local_user_data.nil?
         
         OpenStruct.new(default_options)
       end
@@ -41,10 +41,13 @@ module PoolParty
           op.banner = opts[:banner] if opts[:banner]
           op.on('-A key', '--access-key key', "Ec2 access key (ENV['ACCESS_KEY'])") { |key| default_options[:access_key] = key }
           op.on('-S key', '--secret-access-key key', "Ec2 secret access key (ENV['SECRET_ACCESS_KEY'])") { |key| default_options[:secret_access_key] = key }
-          op.on('-I ami', '--image-id id', "AMI instance (default: 'ami-4a46a323')") {|id| default_options[:ami] = id }
+          op.on('-I ami', '--image-id id', "AMI instance (default: 'ami-40bc5829')") {|id| default_options[:ami] = id }
           op.on('-k keypair', '--keypair name', "Keypair name (ENV['KEYPAIR_NAME'])") { |key| default_options[:keypair] = key }
-          op.on('-b bucket', '--bucket bucket', "Application bucket") { |bucket| default_options[:shared_bucket] = bucket }          
-          op.on('-D ec2 directory', '--ec2-dir dir', "Directory with ec2 data (default: '~/.ec2')") {|id| default_options[:ec2_dir] = id }
+          op.on('-b bucket', '--bucket bucket', "Application bucket") { |bucket| default_options[:shared_bucket] = bucket }
+          # //THIS IS WHERE YOU LEFT OFF
+          op.on('-D working directory', '--dir dir', "Working directory") { |d| default_options[:working_directory] = d }
+          
+          op.on('--ec2-dir dir', "Directory with ec2 data (default: '~/.ec2')") {|id| default_options[:ec2_dir] = id }
           op.on('-r names', '--services names', "Monitored services (default: '')") {|id| default_options[:services] = id }
           op.on('-c file', '--config-file file', "Config file (default: '')") {|file| default_options[:config_file] = file }
           op.on('-l plugin_dir', '--plugin-dir dir', "Plugin directory (default: '')") {|file| default_options[:plugin_dir] = file }
@@ -106,13 +109,14 @@ module PoolParty
           :username => "root",
           :ec2_dir => ENV["EC2_HOME"],
           :keypair => ENV["KEYPAIR_NAME"],
-          :ami => 'ami-4a46a323',
+          :ami => 'ami-44bd592d',
           :shared_bucket => "",
-          :expand_when => "web_usage < 1.5\n memory > 0.85",
+          :expand_when => "web < 1.5\n memory > 0.85",
           :contract_when => "cpu < 0.20\n memory < 0.10",
           :os => "ubuntu",
           :plugin_dir => "vendor",
-          :install_on_load => false
+          :install_on_load => false,
+          :working_directory => Dir.pwd
         }
       end
       # Services monitored by Heartbeat
@@ -126,16 +130,19 @@ module PoolParty
           :secret_access_key => secret_access_key,
           :user_data => user_data}.to_yaml
       end
-      def local_user_data
-        @local_user_data ||= 
+      def local_user_data        
         begin
-          @@timer.timeout(5.seconds) do
-            YAML.load(open("http://169.254.169.254/latest/user-data").read)
+          @@timer.timeout(3.seconds) do
+            @local_user_data ||=YAML.load(open("http://169.254.169.254/latest/user-data").read)
           end
         rescue Exception => e
-          {}
+          @local_user_data = {}
         end
       end
+      # For testing purposes
+      def reset!
+        @local_user_data = nil
+      end
       # Keypair path
       # Idiom:
       #  /Users/username/.ec2/id_rsa-name
@@ -168,7 +175,7 @@ module PoolParty
         end
       end
       def version
-        PoolParty::Version::STRING
+        PoolParty::Version.string
       end
       def install_on_load?(bool=false)
         options.install_on_load == true || bool

data/lib/poolparty/init.rb

@@ -1,6 +1,6 @@
 =begin rdoc
   Load the files in order
 =end
-%w(optioner application monitors scheduler provider remoter remoting remote_instance master tasks plugin plugin_manager).each do |f|
+%w(optioner application thread_pool scheduler provider remoter remoting remote_instance master monitors tasks plugin plugin_manager).each do |f|
   require File.join(File.dirname(__FILE__), f)
 end

data/lib/poolparty/master.rb

@@ -5,17 +5,16 @@ module PoolParty
   class Master < Remoting
     include Aska
     include Callbacks
-    include Monitors
     # ############################
     include Remoter
     # ############################
     include FileWriter
     
     def initialize
-      super
+      super            
       
-      self.class.send :rules, :contract_when, Application.options.contract_when
-      self.class.send :rules, :expand_when, Application.options.expand_when
+      self.class.send :rules, :contract_when, Application.options.contract_when unless are_rules?(:contract_when)
+      self.class.send :rules, :expand_when, Application.options.expand_when unless are_rules?(:expand_when)
     end
     # Start the cloud
     def start_cloud!
@@ -82,11 +81,16 @@ module PoolParty
           sudo apt-get update --fix-missing
         EOE
         
-        execute_tasks do
-          ssh(update_apt_string)
-        end
+        ssh(update_apt_string)
+        
         Provider.install_poolparty(cloud_ips)
         Provider.install_userpackages(cloud_ips)
+        
+        # For plugins
+        nodes.each do |node|
+          node.install
+        end
+        
       end
     end
     def cloud_ips
@@ -106,13 +110,14 @@ module PoolParty
         end
         # Daemonize only if we are not in the test environment
         run_thread_loop(:daemonize => !Application.test?) do
-          add_task {launch_minimum_instances} # If the base instances go down...
+          add_task {PoolParty.message "Checking cloud"}
+          add_task {launch_minimum_instances}
           add_task {reconfigure_cloud_when_necessary}
           add_task {scale_cloud!}
           add_task {check_stats}
         end
       rescue Exception => e
-        puts "There was an error: #{e.nice_message}"
+        Process.kill("HUP", Process.pid)
       end
     end
     alias_method :start_monitor, :start_monitor!
@@ -120,6 +125,8 @@ module PoolParty
     end
     # Sole purpose to check the stats, mainly in a plugin
     def check_stats
+      str = registered_monitors.collect {|m| "#{m}"}
+      PoolParty.message "Monitors: #{str.join(", ")}"
     end
     # Add an instance if the cloud needs one ore terminate one if necessary
     def scale_cloud!
@@ -132,9 +139,11 @@ module PoolParty
     # This is a basic check against the local store of the instances that have the 
     # stack installed.
     def reconfigure_cloud_when_necessary
+      PoolParty.message "#{number_of_unconfigured_nodes} unconfigured nodes"
       configure_cloud if number_of_unconfigured_nodes > 0
     end
     def number_of_unconfigured_nodes
+      # TODO: Find a better way to tell if the nodes are configured.
       nodes.reject {|a| a.stack_installed? }.size
     end
     def grow_by(num=1)
@@ -147,15 +156,24 @@ module PoolParty
     end
     def shrink_by(num=1)
       num.times do |i|
+        # Get the last node that is not the master
         node = nodes.reject {|a| a.master? }[-1]
-        request_termination_of_instance(node.instance_id) if node        
+        res = request_termination_of_instance(node.instance_id) if node
+        PoolParty.message "#{res ? "Could" : "Could not"} shutdown instance"
       end
       wait_for_all_instances_to_terminate
       configure_cloud
     end
-    
+    def make_base_tmp_dir(c)
+      `mkdir #{base_tmp_dir}` unless File.directory?(base_tmp_dir)
+    end
+    before :build_and_send_config_files_in_temp_directory, :make_base_tmp_dir
     def build_and_send_config_files_in_temp_directory
       require 'ftools'
+      if File.directory?(Application.plugin_dir)
+        Kernel.system("tar -czf #{base_tmp_dir}/plugins.tar.gz #{File.basename(Application.plugin_dir)}")
+      end
+      
       File.copy(get_config_file_for("cloud_master_takeover"), "#{base_tmp_dir}/cloud_master_takeover")
       File.copy(get_config_file_for("heartbeat.conf"), "#{base_tmp_dir}/ha.cf")
       
@@ -180,12 +198,12 @@ module PoolParty
           build_heartbeat_config_file_for(node)
           build_heartbeat_resources_file_for(node)
         end
-      end      
+      end
     end
     def cleanup_tmp_directory(c)
       Dir["#{base_tmp_dir}/*"].each {|f| FileUtils.rm_rf f} if File.directory?("tmp/")
     end
-    before :build_and_send_config_files_in_temp_directory, :cleanup_tmp_directory    
+    before :build_and_send_config_files_in_temp_directory, :cleanup_tmp_directory
     # Send the files to the nodes
     def send_config_files_to_nodes(c)
       run_array_of_tasks(rsync_tasks("#{base_tmp_dir}/*", "#{remote_base_tmp_dir}"))
@@ -205,12 +223,18 @@ chmod +x #{script_file}
     end
     # Add an instance if the load is high
     def add_instance_if_load_is_high
-      grow_by(1) if expand?
+      if expand?
+        PoolParty.message "Cloud needs expansion"
+        grow_by(1)
+      end
     end
     alias_method :add_instance, :add_instance_if_load_is_high
     # Teardown an instance if the load is pretty low
     def terminate_instance_if_load_is_low      
-      shrink_by(1) if contract?
+      if contract?
+        PoolParty.message "Cloud to shrink"
+        shrink_by(1)
+      end
     end
     alias_method :terminate_instance, :terminate_instance_if_load_is_low
     # FOR MONITORING
@@ -270,7 +294,7 @@ chmod +x #{script_file}
     def get_config_file_for(name)
       if File.exists?("#{user_dir}/config/#{name}")
         "#{user_dir}/config/#{name}"
-      else 
+      else
         "#{root_dir}/config/#{name}"
       end
     end
@@ -356,6 +380,7 @@ chmod +x #{script_file}
     
     class << self
       include PoolParty
+      include FileWriter
             
       def with_nodes(&block)
         new.nodes.each &block
@@ -377,18 +402,6 @@ chmod +x #{script_file}
       def get_next_node(node)
         new.get_next_node(node)
       end
-      # Build a heartbeat_config_file from the config file in the config directory and return a tempfile
-      def build_heartbeat_config_file_for(node)
-        return nil unless node
-        new.build_heartbeat_config_file_for(node)
-      end
-      # Build a heartbeat resources file from the config directory and return a tempfile
-      def build_heartbeat_resources_file_for(node)
-        return nil unless node && get_next_node(node)
-        new.write_to_file_for("haresources", node) do
-          "#{node.haproxy_resources_entry}\n#{get_next_node(node).haproxy_resources_entry}"
-        end        
-      end      
       def set_hosts(c, remotetask=nil)
         unless remotetask.nil?
           rt = remotetask

data/lib/poolparty/monitors.rb

@@ -8,6 +8,4 @@ module PoolParty
     module Remote
     end    
   end
-end
-
-Dir["monitors/*"].each {|f| require f}
+end

data/lib/poolparty/monitors/cpu.rb

@@ -1,7 +1,9 @@
 =begin rdoc
   Basic monitor on the cpu stats
 =end
-module Cpu  
+require "poolparty"
+
+module Cpu
   module Master
     def cpu
       nodes.size > 0 ? nodes.inject(0) {|i,a| i+=a.cpu } / nodes.size : 0.0
@@ -9,8 +11,10 @@ module Cpu
   end
 
   module Remote
-    def cpu
-      ssh("uptime").split(/\s+/)[-3].to_f rescue 0.0
+    def cpu      
+      str = run("uptime").split(/\s+/)[-3].to_f rescue 0.0
+      PoolParty.message "Cpu usage: #{str}"
+      str
     end
   end
 

data/lib/poolparty/monitors/memory.rb

@@ -1,6 +1,8 @@
 =begin rdoc
   Basic monitor on the cpu stats
 =end
+require "poolparty"
+
 module Memory
   module Master
     # Get the average memory usage over the cloud
@@ -11,14 +13,19 @@ module Memory
 
   module Remote
     def memory
-      str = ssh("free -m | grep -i mem")
-      total_memory = str.split[1].to_f
-      used_memory = str.split[2].to_f
+      out = begin
+        str = run("free -m | grep -i mem")
+
+        total_memory = str.split[1].to_f
+        used_memory = str.split[2].to_f
 
-      used_memory / total_memory        
-    rescue
-      0.0
-    end    
+        used_memory / total_memory
+      rescue Exception => e
+        0.0
+      end
+      PoolParty.message "Memory: #{out}"
+      out  
+    end
   end
   
 end

data/lib/poolparty/monitors/web.rb

@@ -1,6 +1,8 @@
 =begin rdoc
   Basic monitor on the cpu stats
 =end
+require "poolparty"
+
 module Web
   module Master
     # Get the average web request capabilities over the cloud
@@ -11,11 +13,15 @@ module Web
 
   module Remote
     def web
-      str = ssh("httperf --server localhost --port #{Application.client_port} --num-conn 3 --timeout 5 | grep 'Request rate'")
-      str[/[.]* ([\d]*\.[\d]*) [.]*/, 0].chomp.to_f
-    rescue
-      0.0
-    end    
+      out = begin
+        str = run("httperf --server localhost --port #{Application.client_port} --num-conn 3 --timeout 5 | grep 'Request rate'")
+        str[/[.]* ([\d]*\.[\d]*) [.]*/, 0].chomp.to_f
+      rescue Exception => e
+        0.0
+      end
+      PoolParty.message "Web requests: #{out}"
+      out
+    end
   end
   
 end

data/lib/poolparty/provider/packages/essential.rb

@@ -2,5 +2,5 @@
 
 package :build_essential do
   description 'Build tools'
-  apt %w(build-essential)
+  apt %w( build-essential )
 end

data/lib/poolparty/provider/packages/heartbeat.rb

@@ -1,4 +1,4 @@
 package :heartbeat, :provides => :failover do
   description "Heartbeat Linux HA project"
-  apt %w(heartbeat-2)
+  apt %w( heartbeat-2 )
 end

data/lib/poolparty/provider/packages/ruby.rb

@@ -22,16 +22,7 @@ package :rubygems do
   requires :ruby
 end
 
-package :poolparty_required_gems do
-  description "required gems"
-  gems %w( SQS aws-s3 amazon-ec2 aska rake rcov auser-poolparty )
-end
-
 package :required_gems do
   description "Pool party gem"
-  gem "poolparty" do
-    source 'http://gems.github.com -y'
-  end
-  
-  required :poolparty_required_gems
+  gems %w( SQS aws-s3 amazon-ec2 auser-aska rake rcov auser-poolparty vlad --no-ri --no-rdoc)
 end

data/lib/poolparty/remote_instance.rb

@@ -22,7 +22,7 @@ module PoolParty
       @number = obj[:number] || 0 # Defaults to the master
       @status = obj[:status] || "running"
       @launching_time = obj[:launching_time] || Time.now
-      @keypair = obj[:keypair] || Application.keypair
+      @keypair = obj[:keypair] || Application.keypair rescue ""
     end
     
     # Host entry for this instance
@@ -159,18 +159,9 @@ module PoolParty
           mkdir -p /data && /usr/bin/s3fs #{Application.shared_bucket} -o accessKeyId=#{Application.access_key} -o secretAccessKey=#{Application.secret_access_key} -o nonempty /data
         EOC
       end
-    end
-        
+    end        
     # Installs with one commandline and an scp, rather than 10
     def install
-      # unless stack_installed?
-      #   execute_tasks do
-      #     # scp(base_install_script, "~/base_install.sh")          
-      #     ssh("chmod +x base_install.sh && /bin/sh base_install.sh && rm base_install.sh && echo 'installed!' ")
-      #   end
-      #   PoolParty.message "After install execute_tasks"
-      #   mark_installed
-      # end
     end
     # Login to store the authenticity
     def login_once
@@ -192,12 +183,8 @@ module PoolParty
     def configure      
     end
     def update_plugin_string
-      reset!
-      str = "mkdir -p #{Application.plugin_dir} && cd #{Application.plugin_dir}\n"
-      installed_plugins.each do |plugin_source|
-        str << "git clone #{plugin_source}\n"
-      end
-      str
+      dir = File.basename(Application.plugin_dir)
+      "if [[ -f plugins.tar.gz ]]; then mkdir -p #{dir} && tar -zxf plugins.tar.gz -C #{dir}; fi"
     end
     # Is this the master and if not, is the master running?
     def is_not_master_and_master_is_not_running?
@@ -224,7 +211,7 @@ module PoolParty
       end
     end
     def stack_installed?
-      @stack_installed ||= false
+      @stack_installed ||= run("cat ~/.installed")
     end
     def mark_installed(caller=nil)
       run_now("echo 'installed' > ~/.installed")