auser-poolparty 0.2.45 → 0.2.46

data/lib/erlang/messenger/src/pm_node.erl

@@ -11,20 +11,23 @@
 -include_lib("../include/defines.hrl").
 
 %% API
--export([start_link/0]).
+-export([start_link/1, start_link/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 
--record(state, {}).
+-record(state, {
+					monitors = {}  % Tuple of monitors
+				}).
 -define(SERVER, ?MODULE).
+-define (UPDATE_TIME, 2000).
 
 % Client function definitions
 -export ([stop/0]).
 -export ([get_load_for_type/1, run_cmd/1, fire_cmd/1]).
--export ([run_reconfig/0]).
-
+-export ([run_reconfig/0, local_update/1, still_here/0, print_monitors/0]).
+-export ([server_location/0]).
 %%====================================================================
 %% API
 %%====================================================================
@@ -39,16 +42,24 @@ get_load_for_type(Type) ->
 	{os:cmd(String)}.
 
 % Rerun the configuration
-run_reconfig() ->
-	gen_server:cast(?MODULE, reconfig).
+run_reconfig() -> gen_server:cast(server_location(), {run_reconfig}).
+print_monitors() -> gen_server:call(server_location(), {print_monitors}).
 
 % Allows us to fire off any command (allowed by poolparty on the check)
-run_cmd(Cmd) -> gen_server:call(?MODULE, {run_command, Cmd}).
-fire_cmd(Cmd) -> gen_server:cast(?MODULE, {fire_command, Cmd}).
+run_cmd(Cmd) -> gen_server:call(server_location(), {run_command, Cmd}).
+fire_cmd(Cmd) -> gen_server:cast(server_location(), {fire_command, Cmd}).
+
+still_here() -> gen_server:call(server_location(), {still_there}).
 
 % Stop the pm_node entirely
-stop() ->
-	gen_server:cast(?MODULE, stop).
+stop() -> gen_server:cast(server_location(), stop).
+
+% Run every UPDATE_TIME seconds
+local_update(Types) ->
+	?TRACE("Updating", [?MASTER_LOCATION]),	
+	net_adm:ping(?MASTER_LOCATION),
+	Load = [{Ty, element(1, get_load_for_type(Ty))} || Ty <- Types],
+	gen_server:cast(?MASTER_SERVER, {update_node_load, node(), Load}).
 	
 %%--------------------------------------------------------------------
 %% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
@@ -59,10 +70,8 @@ stop() ->
 %% 
 %% Fires a ping every 10 seconds
 %%--------------------------------------------------------------------
-start_link() ->
-	io:format("Pinging master at ~p~n", [?MASTER_LOCATION]),
-	utils:start_timer(10000, fun() -> net_adm:ping(?MASTER_LOCATION) end),
-  gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+start_link() -> start_link(erlang:get_plain_arguments()).
+start_link(Args) -> gen_server:start_link({global, node()}, ?MODULE, Args, Args).
 
 %%====================================================================
 %% gen_server callbacks
@@ -75,9 +84,13 @@ start_link() ->
 %%                         {stop, Reason}
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
-init([]) ->
+init(Args) ->
+	io:format("Master location ~p~n", [?MASTER_LOCATION]),
 	process_flag(trap_exit, true),
-  {ok, #state{}}.
+	utils:start_timer(?UPDATE_TIME, fun() -> pm_node:local_update(Args) end),
+  {ok, #state{
+					monitors=Args
+				}}.
 
 %%--------------------------------------------------------------------
 %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
@@ -91,6 +104,13 @@ init([]) ->
 handle_call({run_command, Cmd}, _From, State) ->
 	Reply = os:cmd(". /etc/profile && server-fire-cmd \""++Cmd++"\""),
 	{reply, Reply, State};
+handle_call({still_there}, _From, State) ->
+	Reply = still_here,
+	{reply, Reply, State};
+handle_call({print_monitors}, _From, State) ->
+	[ io:format("Type: ~p ", [Monitor]) || Monitor <- State#state.monitors ],
+	io:format("~n"),
+	{reply, ok, State};
 handle_call(_Request, _From, State) ->
   Reply = ok,
   {reply, Reply, State}.
@@ -101,19 +121,16 @@ handle_call(_Request, _From, State) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
-handle_cast({Msg, Cmd}, State) ->
-	case Msg of
-		reconfig ->
-			io:format("Running reconfig~n"),
-			os:cmd(". /etc/profile && server-rerun"),
-			{ok};
-		fire_command ->
-			io:format("Running command: ~p~n", [Cmd]),
-			os:cmd(". /etc/profile && server-fire-cmd \""++Cmd++"\" 2>&1 > /dev/null"),
-			{ok};
-		_ ->
-			{ok, State}
-	end.
+handle_cast({fire_command, Cmd}, State) ->
+	?TRACE("Running command: ~p~n", [Cmd]),
+	os:cmd(". /etc/profile && server-fire-cmd \""++Cmd++"\" 2>&1 > /dev/null"),
+	{noreply, State};
+handle_cast({run_reconfig}, State) ->
+	?TRACE("Running Reconfig", ["server-rerun"]),
+	os:cmd(". /etc/profile && server-rerun"),
+	{noreply, State};
+handle_cast(_Msg, State) ->
+	{noreply, State}.
 
 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -141,4 +158,8 @@ terminate(_Reason, _State) ->
 %% Description: Convert process state when code is changed
 %%--------------------------------------------------------------------
 code_change(_OldVsn, State, _Extra) ->
-  {ok, State}.
+  {ok, State}.
+
+% Private
+server_location() ->
+	global:whereis_name(node()).

data/lib/erlang/messenger/src/pm_node_supervisor.erl

@@ -4,16 +4,16 @@
 -module (pm_node_supervisor).
 -behaviour(supervisor).
 
--export([start/0, start_in_shell_for_testing/0, start_link/1, init/1]).
+-export ([start/0, start/1]).
+-export([start_in_shell_for_testing/0, start_link/1, init/1]).
 
 -ifdef(EUNIT).
 -include_lib("eunit/include/eunit.hrl").
 -endif.
 
-start() ->
-	spawn(fun() ->
-			supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = [])
-		end).
+start() -> spawn(fun() -> supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = []) end).
+start(Args) -> spawn(fun() -> supervisor:start_link({local, ?MODULE}, ?MODULE, Args) end).
+	
 
 start_in_shell_for_testing() ->
 	{ok, Pid} = supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = []),
@@ -22,7 +22,7 @@ start_in_shell_for_testing() ->
 start_link(Args) ->
 	supervisor:start_link({local, ?MODULE}, ?MODULE, Args).
 
-init([]) ->
+init(Args) ->
 	RestartStrategy = one_for_one,
 	MaxRestarts = 1000,
 	MaxTimeBetRestarts = 3600,
@@ -31,7 +31,7 @@ init([]) ->
 	SupFlags = {RestartStrategy, MaxRestarts, MaxTimeBetRestarts},
 	
 	EventManager = {pm_event_manager,  {pm_event_manager, start_link, []}, permanent, TimeoutTime, worker, dynamic},
-	NodeServer = {pm_node1, {pm_node, start_link, []}, permanent, TimeoutTime, worker, [pm_node]},
+	NodeServer = {pm_node1, {pm_node, start_link, Args}, permanent, TimeoutTime, worker, [pm_node]},
 
 	LoadServers = [EventManager, NodeServer],
 

data/lib/erlang/messenger/src/utils.erl

@@ -26,8 +26,10 @@ tick_timer(Time, Fun) ->
 		tick_timer(Time, Fun) 
 end. 
 
+average_of_list(L) ->
+	Sum = lists:foldr( fun(Int, Sum) -> Int + Sum end, 0, [F || F <- L] ),
+	average_for_list(Sum, L).
 
-% Private
 % Get the average of the list
 average_for_list(Num, L) ->
 	case length(L) of

data/lib/erlang/messenger/useful_snippets

@@ -6,10 +6,10 @@
 % 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.44/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.46/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.44/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.46/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
 
 % 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
 

data/lib/poolparty/base_packages/haproxy.rb

@@ -7,9 +7,7 @@ module PoolParty
           has_package({:name => "haproxy"})
 
           # Restart sysklogd after we update the haproxy.log
-          has_service(:name => "sysklogd") do
-            ensures "running"
-          end
+          has_service(:name => "sysklogd")
           
           # Template variables
           has_variable(:name => "name_haproxy", :value => "#{cloud.name}")

data/lib/poolparty/base_packages/poolparty.rb

@@ -47,7 +47,7 @@ module PoolParty
         
         # Cloud panel setup
         
-        has_directory(:name => "/var/www/cloudpanel")
+        # has_directory(:name => "/var/www/cloudpanel")
         
         # has_file(:name => "/etc/yaws/conf.d/localhost.conf") do
         #   template File.join(File.dirname(__FILE__), "..", "templates/yaws.conf")
@@ -63,7 +63,7 @@ module PoolParty
           has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
             requires get_gempackage("poolparty-latest")
             command(". /etc/profile && cloud-handle-load")
-          end          
+          end
         end
         execute_on_node do
           has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
@@ -74,10 +74,11 @@ module PoolParty
         
         # These are all requirements on the master
         execute_on_master do
-          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => get_gempackage("poolparty-latest")})
           # TODO: Update this so it only runs when needed
           has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :onlyif => "ps aux | grep beam | grep master")
           
+          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty-latest"), get_cron("puppetd runner"), get_cron("Load handler"), get_exec("start master messenger"), get_service("haproxy")]})
+          
           has_remotefile(:name => "/usr/bin/puppetcleaner") do
             mode 744
             template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")

data/lib/poolparty/helpers/optioner.rb

@@ -33,7 +33,6 @@ module PoolParty
     def set_default_options
       self.verbose false
       self.quiet false
-      self.version PoolParty::VERSION::STRING
     end
     
     def parse_options(&blk)
@@ -42,40 +41,43 @@ module PoolParty
       opts.banner = "Usage: #{progname} #{@abstract ? "[command] " : ""}[options]"
 
       opts.separator ""
-      opts.separator "Options:"
-      
-      opts.on('-V', '--version', 'Display the version')    { output_version ; exit 0 }
-      opts.on('-v', '--verbose', 'Be verbose')    { self.verbose true }  
-      opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file }
-      opts.on('-t', '--test', 'Testing mode')    { self.testing true }
-                  
-      blk.call(opts, self) if blk
       
       unless @abstract
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          puts @extra_help
-          exit
-        end
+        opts.separator "Options:"
+        
+        opts.on('-v', '--verbose', 'Be verbose')    { self.verbose true }  
+        opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file }
+        opts.on('-t', '--test', 'Testing mode')    { self.testing true }
+
+        blk.call(opts, self) if blk
+      end
+      
+      opts.on('-V', '--version', 'Display the version')    { puts @version ; exit 0 }
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        puts @extra_help
+        exit
       end
       
       opts.parse(@arguments.dup)
       
       process_options
       output_options if verbose
-      self.loaded_pool load_pool(self.spec || Binary.get_existing_spec_location)
-      
-      self.loaded_clouds extract_cloud_from_options(self)
-      self.loaded_pools extract_pool_from_options(self)
-      
-      reject_junk_options!
-      raise CloudNotFoundException.new("Please specify your cloud with -s, move it to ./pool.spec or in your POOL_SPEC environment variable") unless loaded_clouds && !loaded_clouds.empty?
-      loaded_clouds.each do |cl|
-        cl.configure(self.options)
+      unless @abstract
+        self.loaded_pool load_pool(self.spec || Binary.get_existing_spec_location)
+
+        self.loaded_clouds extract_cloud_from_options(self)
+        self.loaded_pools extract_pool_from_options(self)
+
+        reject_junk_options!
+        raise CloudNotFoundException.new("Please specify your cloud with -s, move it to ./pool.spec or in your POOL_SPEC environment variable") unless loaded_clouds && !loaded_clouds.empty?
+        loaded_clouds.each do |cl|
+          cl.configure(self.options)
+        end
       end
     end
     def reject_junk_options!
-      %w(loaded_pool cloudname).each do |opt|
+      %w(loaded_pool cloudname extract_pool_from_options).each do |opt|
         @options.delete(opt.to_sym)
       end
     end
@@ -83,7 +85,7 @@ module PoolParty
     end
         
     def output_version
-      puts version
+      puts @version
     end
     
   end

data/lib/poolparty/helpers/provisioners/master.rb

@@ -93,6 +93,7 @@ cp #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_
       
       def install_poolparty
         <<-EOE
+#{installer_for("ruby rubygems")}
 cd /var/poolparty
 wget http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem -O logging.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem -O ZenTest.gem 2>&1

data/lib/poolparty/helpers/provisioners/slave.rb

@@ -5,7 +5,8 @@ module PoolParty
       def install_tasks
         [ 
           setup_puppet,
-          setup_configs
+          setup_configs,
+          run_once_and_clean
         ] << configure_tasks
       end
 
@@ -29,6 +30,13 @@ module PoolParty
           # /usr/bin/puppetrerun
         EOS
       end
+      
+      def run_once_and_clean
+        <<-EOS
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string}
+rm -rf /etc/puppet/ssl
+        EOS        
+      end
 
       # /etc/init.d/puppetmasterd stop
       # puppetd --listen --fqdn #{@instance.name}

data/lib/poolparty/monitors/base_monitor.rb

@@ -31,7 +31,7 @@ module PoolParty
       $available_monitors ||= []
     end
     
-    class BaseMonitor      
+    class BaseMonitor
       def self.run
         new.run
       end

data/lib/poolparty/monitors/monitors/memory_monitor.rb

@@ -4,7 +4,35 @@ module PoolParty
     class MemoryMonitor < BaseMonitor
       
       def run
-        str = %x[free -m | grep -i mem]
+        uname = %x[uname]
+        case uname.chomp
+        when "Darwin"
+          darwin_memory_usage
+        else
+          nix_memory_usage
+        end                
+      end
+      
+      def darwin_memory_usage
+        str = %x[vm_stat]
+        keep_array = []
+        array_of_strings = str
+        begin
+          free_memory = array_of_strings[/free:(\W*)+([0-9]+)/, 2].to_f
+          active_memory = array_of_strings[/active:(\W*)([0-9]+)/, 2].to_f
+          inactive_memory = array_of_strings[/inactive:(\W*)([0-9]+)/, 2].to_f
+
+          used_memory = (active_memory + inactive_memory)
+          total_memory = (free_memory + active_memory + inactive_memory)
+
+          used_memory / total_memory
+        rescue Exception => e
+          0.0
+        end                 
+      end
+      
+      def nix_memory_usage
+        str = %x[free -m #{unix_hide_string} | grep -i mem]
         begin
           total_memory = str.split[1].to_f
           used_memory = str.split[2].to_f
@@ -13,7 +41,6 @@ module PoolParty
         rescue Exception => e
           0.0
         end
-        
       end
             
     end

data/lib/poolparty/monitors/monitors/web_monitor.rb

@@ -0,0 +1,18 @@
+=begin rdoc
+  Web monitor.
+=end
+module PoolParty
+  module Monitors
+    
+    class WebMonitor < BaseMonitor
+      
+      def run
+        str = %x[httperf]
+        str.split(/\s+/)[-1].to_f rescue 0.0
+      end
+            
+    end
+    
+    register_monitor :cpu
+  end
+end

data/lib/poolparty/net/messenger.rb

@@ -2,6 +2,9 @@
   The connection to the messenger from poolparty, the client
 =end
 module PoolParty
+  def reconfigure_cloud!
+    Messenger.messenger_send!("reconfigure_cloud")
+  end
   module Messenger
     
     # TODO: Fix cookie setting
@@ -22,8 +25,8 @@ module PoolParty
     
     # Helper methods
     def self.startup_remote_messenger(hostname, testing=false)
-      messenger_send!("")
-      testing ? command : %x[#{command}]
+      # messenger_send!("")
+      # testing ? command : %x[#{command}]
     end
     
   end

data/lib/poolparty/net/remoter_base.rb

@@ -77,7 +77,21 @@ 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 }
+        unless @describe_instances
+          tmpInstanceList = describe_instances.select {|a| key ? a[:keypair] == key : true }
+          has_master = tmpInstanceList.collect {|a| a[:name] }.include?("master")
+          if has_master
+            @describe_instances = tmpInstanceList
+          else            
+            @id = 0
+            @describe_instances = tmpInstanceList.sort_by {|a| a[:status] }.map do |inst|
+              inst[:name] = (@id == 0 ? "master" : "node#{@id}")
+              @id += 1
+              inst
+            end
+          end
+        end
+        @describe_instances
       end
       # Instances
       # Get the master from the cloud

data/lib/poolparty/plugins/git.rb

@@ -16,14 +16,14 @@ module PoolParty
           creates "#{::File.join( (parent.cwd ? parent.cwd : cwd), ::File.basename(parent.source, ::File.extname(parent.source)) )}/.git"
         end
         has_exec(:name => "update-#{name}", :requires => get_exec("git-#{name}")) do
-          cwd get_exec("git-#{parent.name}").cwd
+          cwd ::File.dirname(get_exec("git-#{parent.name}").creates)
           command "git pull"
         end
       end
       
       def at(dir)
         cwd dir
-        has_directory(:name => "#{dir}", :requires => "#{::File.dirname(dir)}")
+        has_directory(:name => "#{dir}", :requires => get_directory("#{::File.dirname(dir)}"))
       end
       
       # Since git is not a native type, we have to say which core resource

data/lib/poolparty/pool/loggable.rb

@@ -2,9 +2,7 @@
   A logging class to allow us to log to locations
 =end
 class Loggable
-  def initialize
-    Logging.init :debug, :info, :warn, :error, :fatal
-    
+  def initialize    
     self.class.loggers << file_logger
     file_logger.level = :info
   end

data/lib/poolparty/pool/resources/sshkey.rb

@@ -5,7 +5,7 @@ module PoolParty
       
       default_options({
         :command => nil,
-        :key => "ALONGSTRINGOFDIGITS",
+        # :key => "ALONGSTRINGOFDIGITS",
         :target => "~/.ssh/poolparty_id_rsa"
       })
       

data/lib/poolparty/version.rb

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

data/lib/poolparty.rb

@@ -23,6 +23,7 @@ require "#{File.dirname(__FILE__)}/poolparty/version"
 end
 
 Kernel.load_p File.dirname(__FILE__) + "/poolparty/pool"
+Logging.init :debug, :info, :warn, :error, :fatal
 
 module PoolParty
   include FileWriter
@@ -31,6 +32,12 @@ module PoolParty
     @logger ||= make_new_logger
   end
   
+  class PoolParty
+    def initialize(spec)
+      Script.inflate(spec) if spec
+    end
+  end
+  
   private
   #:nodoc:#
   def make_new_logger

data/lib/poolpartycl.rb

@@ -1,3 +1,7 @@
 Dir["#{File.dirname(__FILE__)}/poolparty/helpers/**.rb"].each do |lib|
   require lib
+end
+
+def help_array
+  ["-h", "--help", "-V", "--version"]
 end