auser-poolparty 0.2.42 → 0.2.44

data/bin/cloud-maintain

@@ -26,7 +26,7 @@ include Remote
       vputs "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
       vputs "Launching new instance"
       launch_minimum_number_of_instances
-    elsif !maximum_number_of_instances_are_not_running?
+    elsif maximum_number_of_instances_are_running?
       vputs "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
       vputs "Shutting down non-master instance"
       contract_cloud_if_necessary( !testing )

data/bin/cloud-provision

@@ -21,7 +21,6 @@ include Remote
     
     if instance_num
       @instance = get_instance_by_number( instance_num )
-      vputs "Provisioning instance: #{@instance.name} (#{instance_num})"
       instance_num == 0 ? Provisioner.provision_master(self, testing) : Provisioner.provision_slave(@instance, self, testing)
     else
       if provision_slave

data/lib/erlang/messenger/useful_snippets

@@ -6,9 +6,12 @@
 % erl -pa ./ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -setcookie poolparty -boot pm_node_rel-0.1 -sname node1
 
 % Starting the client on the master
-% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.37/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.42/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
 
 % Get the load
-% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.40/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start -run pm_client get_load cpu -run erlang init stop
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.42/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start -run pm_client get_load cpu -run erlang init stop
 
-% cd /var/poolparty && gem uninstall poolparty && wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1 && gem install --no-ri --no-rdoc poolparty-latest.gem
+% cd /var/poolparty && gem uninstall poolparty && wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1 && gem install --no-ri --no-rdoc poolparty-latest.gem
+
+% LOAD TESTING
+% ab -n 10000 -c 5 http://75.101.162.232/

data/lib/poolparty/base_packages/haproxy.rb

@@ -27,12 +27,14 @@ module PoolParty
 
           # Service is required
           has_service(:name => "haproxy", :ensures => "running")
+          
+          has_exec(:name => "reloadhaproxy", :command => "/etc/init.d/haproxy reload", :requires => get_package("haproxy"))
 
           # These can also be passed in via hash
           has_remotefile(:name => "/etc/haproxy.cfg") do
             mode 644
             requires get_package("haproxy")
-            notify get_service("haproxy")
+            notify get_exec("reloadhaproxy")
             template File.join(File.dirname(__FILE__), "..", "templates/haproxy.conf")
           end
         end

data/lib/poolparty/base_packages/poolparty.rb

@@ -60,6 +60,10 @@ module PoolParty
             requires get_gempackage("poolparty-latest")
             command(PoolParty::Remote::RemoteInstance.puppet_master_rerun_command)
           end
+          has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
+            requires get_gempackage("poolparty-latest")
+            command(". /etc/profile && cloud-handle-load")
+          end          
         end
         execute_on_node do
           has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do

data/lib/poolparty/net/remote.rb

@@ -12,7 +12,7 @@ module PoolParty
           self.class.send :attr_reader, :remote_base
           mod = "#{t}".preserved_module_constant
           
-          mod.send :include, PoolParty::Remote::RemoterBase
+          # mod.send :include, PoolParty::Remote::RemoterBase
           self.class.send :include, mod
           self.extend mod
           

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -18,11 +18,12 @@ module PoolParty
         :availability_zone => nil,
         :size => "#{size || Base.size}")
       begin
-        item = instance#.instancesSet.item
-        inst = EC2ResponseObject.get_hash_from_response(item)        
+        h = EC2ResponseObject.get_hash_from_response(instance)
+        h = instance.instancesSet.item.first
       rescue Exception => e
+        h = instance
       end
-      inst
+      h
     end
     # Terminate an instance by id
     def terminate_instance!(instance_id=nil)
@@ -46,15 +47,22 @@ module PoolParty
           :hostname => h[:ip],
           :ip => h[:ip].convert_from_ec2_to_ip
         })
-      end      
+      end
     end
     # Get the s3 description for the response in a hash format
     def get_instances_description
       EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time]}
     end
         
-    def after_launch_master(instance=nil)      
-      ec2.associate_address(:instance_id => instance.instance_id, :public_ip => set_master_ip_to) if set_master_ip_to && instance
+    def after_launch_master(instance=nil)
+      begin
+        when_no_pending_instances do
+          ec2.associate_address(:instance_id => instance.instanceId, :public_ip => set_master_ip_to) if set_master_ip_to && instance
+        end
+      rescue Exception => e        
+      end
+      reset_remoter_base!
+      when_all_assigned_ips {wait "2.seconds"}
     end
     
     # Help create a keypair for the cloud
@@ -92,7 +100,7 @@ module PoolParty
       ]
     end
     
-    def reset!
+    def reset_base!
       @describe_instances = @cached_descriptions = nil
     end
   end
@@ -131,6 +139,7 @@ class EC2ResponseObject
       rs ||= rs.respond_to?(:instancesSet) ? rs.instancesSet : rs
       rs.reject! {|a| a.nil? || a.empty? }
     rescue Exception => e
+      resp
     end
     rs
   end

data/lib/poolparty/net/remoter.rb

@@ -105,9 +105,12 @@ module PoolParty
         out
       end
       def request_launch_master_instance
-        after_launch_master(launch_new_instance!)
+        inst = launch_new_instance!
+        wait "5.seconds"
+        when_no_pending_instances {after_launch_master(inst)}
       end
-      def after_launch_master(h={})        
+      def after_launch_master(h={})
+        vputs "After launch master in remoter"
       end
       # Let's terminate an instance that is not the master instance
       def request_termination_of_non_master_instance
@@ -116,12 +119,16 @@ module PoolParty
       end
       # Can we start a new instance?
       def can_start_a_new_instance?
-        maximum_number_of_instances_are_not_running?
+        maximum_number_of_instances_are_not_running? && list_of_pending_instances.size == 0
       end
-      # Are the maximum number of instances running?
+      # Are the maximum number of instances not running?
       def maximum_number_of_instances_are_not_running?
         list_of_running_instances.size < maximum_instances.to_i
       end
+      # Are the maximum number of instances running?
+      def maximum_number_of_instances_are_running?
+        list_of_running_instances.size >= maximum_instances.to_i
+      end
       # Launch new instance while waiting for the number of pending instances
       #  to be zero before actually launching. This ensures that we only
       #  launch one instance at a time
@@ -140,6 +147,19 @@ module PoolParty
           when_no_pending_instances(&block)
         end
       end
+      # A convenience method for waiting until all the instances have an ip
+      # assigned to them. This is useful when shifting the ip addresses
+      # around on the instances
+      def when_all_assigned_ips(&block)
+        reset!
+        if list_of_nonterminated_instances.select {|a| a.ip == "not.assigned" }.empty?          
+          block.call if block
+        else
+          vprint "."
+          wait "5.seconds"
+          when_all_assigned_ips(&block)
+        end
+      end
       
       # This will launch the minimum_instances if the minimum number of instances are not running
       # If the minimum number of instances are not running and if we can start a new instance
@@ -158,13 +178,14 @@ module PoolParty
         when_no_pending_instances do
           wait "10.seconds" # Give some time for ssh to startup
           @num_instances = list_of_running_instances.size
+          vputs "(@num_instances - (num))..(@num_instances): #{(@num_instances - (num))..(@num_instances)}"
           last_instances = nonmaster_nonterminated_instances[(@num_instances - (num))..(@num_instances)]
           last_instances.each do |inst|
             PoolParty::Provisioner.provision_slave(inst, self, false) unless inst.master?
             cmd = ". /etc/profile && cloud-provision -i #{inst.name.gsub(/node/, '')} #{unix_hide_string} &"
             Kernel.system cmd
           end
-          PoolParty::Provisioner.reconfigure_master(self, force)          
+          PoolParty::Provisioner.reconfigure_master(self)
         end
       end
       # Launch the master and let the master handle the starting of the cloud
@@ -176,6 +197,7 @@ module PoolParty
         vputs "Requesting to launch new instance"
         logger.debug "Launching master"
         request_launch_master_instance if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
+        reset!
         
         vputs "Waiting for there to be no pending instances..."
         when_no_pending_instances do

data/lib/poolparty/net/remoter_base.rb

@@ -77,7 +77,7 @@ module PoolParty
       # If no keypair is passed, select them all
       def list_of_instances(keyp=nil)
         key = keyp ? keyp : keypair
-        @describe_instances ||= describe_instances.select {|a| key ? a[:keypair] == key : true } if describe_instances
+        @describe_instances ||= describe_instances.select {|a| key ? a[:keypair] == key : true }
       end
       # Instances
       # Get the master from the cloud
@@ -90,8 +90,9 @@ module PoolParty
       def create_keypair
       end
       # Reset the cache of descriptions
-      def reset!
+      def reset_remoter_base!
         @describe_instances = nil
+        reset_base!
       end
       def self.included(other)
         PoolParty.register_remote_base(self.class.to_s.downcase.to_sym)

data/lib/poolparty/pool/cloud.rb

@@ -185,6 +185,7 @@ module PoolParty
       end
       
       def reset!
+        reset_remoter_base!
         @build_manifest = @describe_instances = nil
       end
             

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 42
+    TINY  = 44
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.42
+  version: 0.2.44
 platform: ruby
 authors: 
 - Ari Lerner

data/spec/poolparty/net/remote_bases/ec2_spec.rb

@@ -41,7 +41,7 @@ describe "ec2 remote base" do
       @tr.launch_new_instance!
     end
     it "should get the hash response from EC2ResponseObject" do
-      EC2ResponseObject.should_receive(:get_hash_from_response).with(true).and_return true
+      EC2ResponseObject.should_receive(:get_hash_from_response).and_return true
       @tr.launch_new_instance!
     end
   end

data/spec/poolparty/net/remote_spec.rb

@@ -12,6 +12,7 @@ module Hype
 end
 class TestClass
   include Remote
+  include RemoterBase
   
   def keypair
     "fake_keypair"
@@ -134,7 +135,7 @@ describe "Remote" do
     end
     describe "can_start_a_new_instance?" do
       it "should be true because the maximum instances are not running" do
-        @tc.can_start_a_new_instance?.should == true
+        @tc.can_start_a_new_instance?.should == false
       end
       it "should say that we cannot start a new instance because we are at the maximum instances" do
         add_stub_instance_to(@tc, 7)

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.42</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.44</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.42
+  version: 0.2.44
 platform: ruby
 authors: 
 - Ari Lerner