right_chimp 1.1.3 → 2.0

data/lib/right_chimp/Log.rb

@@ -1,8 +1,11 @@
 module Chimp
   class Log
     @@logger = Logger.new(STDOUT)
+
+    # SeverityID, [DateTime #pid] SeverityLabel -- ProgName: message
+    @@logger.datetime_format = '%H:%M:%S'
     @@logger.sev_threshold=Logger::INFO
-    
+
     def self.logger=(l)
       @@logger = l
     end
@@ -18,7 +21,7 @@ module Chimp
     def self.debug(m)
       @@logger.debug(m)
     end
-    
+
     def self.info(m)
       @@logger.info(m)
     end
@@ -26,9 +29,9 @@ module Chimp
     def self.warn(m)
       @@logger.warn(m)
     end
-    
+
     def self.error(m)
       @@logger.error(m)
-    end    
+    end
   end
 end

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -6,6 +6,7 @@
 
 module Chimp
   class ChimpDaemon
+
     attr_accessor :verbose, :debug, :port, :concurrency, :delay, :retry_count, :dry_run, :logfile, :chimp_queue
     attr_reader :queue, :running
 
@@ -22,6 +23,9 @@ module Chimp
       @running     = false
       @queue       = ChimpQueue.instance
       @chimp_queue = Queue.new
+
+      #Connect to the API
+      Connection.instance
     end
 
     #
@@ -31,7 +35,8 @@ module Chimp
       install_signal_handlers
       parse_command_line
 
-      puts "chimpd #{VERSION} launching with #{@concurrency} workers"
+      #puts "chimpd #{VERSION} launching with #{@concurrency} workers"
+      puts "Loading... please wait"
       spawn_queue_runner
       spawn_webserver
       spawn_chimpd_submission_processor
@@ -51,6 +56,7 @@ module Chimp
           [ '--delay', '-d',        GetoptLong::REQUIRED_ARGUMENT ],
           [ '--retry', '-y',        GetoptLong::REQUIRED_ARGUMENT ],
           [ '--port', '-p',         GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--help', '-h',         GetoptLong::NO_ARGUMENT ],
           [ '--exit', '-x', 				GetoptLong::NO_ARGUMENT ]
         )
 
@@ -71,6 +77,8 @@ module Chimp
               @quiet = true
             when '--port', '-p'
               @port = arg
+            when '--help', '-h'
+              help
             when '--exit', '-x'
             	uri = "http://localhost:#{@port}/admin"
 							response = RestClient.post uri, { 'shutdown' => true }.to_yaml
@@ -90,12 +98,40 @@ module Chimp
       if not @verbose
       	ENV['REST_CONNECTION_LOG'] = "/dev/null"
       	ENV['RESTCLIENT_LOG'] = "/dev/null"
+        Log.threshold= Logger::INFO
+      else
+        Log.threshold= Logger::DEBUG
       end
 
       if @quiet
         Log.threshold = Logger::WARN
       end
+    end
 
+    #
+    # Print out help information
+    #
+    def help
+      puts
+      puts  "chimpd -- a RightScale Platform command-line tool"
+      puts
+      puts  "Syntax: chimpd [--logfile=<name>] [--concurrency=<c>] [--delay=<d>] [--retry=<r>] [--port=<p>] [--verbose]"
+      puts
+      puts  "Options:"
+      puts
+      puts  " --logfile=<name>            Specifiy the desired log location"
+      puts  " --concurrency=<n>           Specify the level of concurrent actions"
+      puts  " --delay=<n>                 Specify the number of seconds to wait before executing the action"
+      puts  " --retry=<r>                 Specify the number of times chimpd should retry executing the action"
+      puts
+      puts  " --verbose                   Run chimpd in verbose mode."
+      puts  " --quiet                     Supress non-essential output"
+      puts
+      puts  " --port=<port>               Specify the port number for chimpd to listen on (default: 9055)"
+      puts
+      puts  " --help                      Displays this menu"
+      puts
+      exit 0
     end
 
     #
@@ -168,8 +204,6 @@ module Chimp
     # Quit by waiting for all chimp jobs to finish, not allowing
     # new jobs on the queue, and killing the web server.
     #
-    # TODO: call @queue.quit, but with a short timeout?
-    #
     def quit
       @running = false
       @server.shutdown
@@ -193,12 +227,15 @@ module Chimp
         c = Chimp.new
         c.interactive = false
         c.quiet = true
-        c.tags = ["bogus:tag=true"]
+        #c.tags = ["bogus:tag=true"]
         c.run
       rescue StandardError
       end
 
+      puts "chimpd #{VERSION} launched with #{@concurrency} workers"
+
       Log.debug "Spawning #{n} submission processing threads"
+
       (1..n).each do |n|
         @threads ||=[]
         @threads << Thread.new {
@@ -207,14 +244,14 @@ module Chimp
               queued_request = @chimp_queue.pop
               group = queued_request.group
               queued_request.interactive = false
-
               tasks = queued_request.process
               tasks.each do |task|
                 ChimpQueue.instance.push(group, task)
               end
 
             rescue StandardError => ex
-              Log.error "submission processor: group=\"#{group}\" script=\"#{queued_request.script}\": #{ex}"
+                puts ex.backtrace
+              Log.error " submission processor: group=\"#{group}\" script=\"#{queued_request.script}\": #{ex}"
             end
           end
         }
@@ -225,6 +262,11 @@ module Chimp
     # GenericServlet -- servlet superclass
     #
     class GenericServlet < WEBrick::HTTPServlet::AbstractServlet
+      #
+      # get_verb
+      # get_id
+      # get_payload
+      #
       def get_verb(req)
         r = req.request_uri.path.split('/')[2]
       end
@@ -235,6 +277,11 @@ module Chimp
         return id
       end
 
+      def get_job_uuid(req)
+        string = req.body.scan(/job_uuid: .{6}/).last
+        job_uuid = string.scan(/ (.{6})/).last.last
+        return job_uuid
+      end
       #
       # Get the body of the request-- assume YAML
       #
@@ -251,6 +298,9 @@ module Chimp
     # AdminServlet - admin functions
     #
     class AdminServlet < GenericServlet
+      #
+      # get do_POST
+      #
       def do_POST(req, resp)
         payload = self.get_payload(req)
         shutdown = payload['shutdown'] || false
@@ -269,6 +319,11 @@ module Chimp
     # http://localhost:9055/group/default/running
     #
     class GroupServlet < GenericServlet
+      #
+      # do_GET
+      # do_POST
+      #
+
       #
       # GET a group by name and status
       # /group/<name>/<status>
@@ -278,7 +333,6 @@ module Chimp
 
         group_name = req.request_uri.path.split('/')[-2]
         filter     = req.request_uri.path.split('/')[-1]
-
         g = ChimpQueue[group_name.to_sym]
         raise WEBrick::HTTPStatus::NotFound, "Group not found" unless g
         jobs = g.get_jobs_by_status(filter)
@@ -309,8 +363,7 @@ module Chimp
           raise WEBrick::HTTPStatus::PreconditionFailed.new("invalid action")
         end
       end
-
-    end
+    end # GroupServlet
 
     #
     # JobServlet - job control
@@ -318,9 +371,15 @@ module Chimp
     # HTTP body is a yaml serialized chimp object
     #
     class JobServlet < GenericServlet
+      #
+      # do_POST
+      # do_GET
+      #
+
       def do_POST(req, resp)
         id      = -1
         job_id  = self.get_id(req)
+        job_uuid= self.get_job_uuid(req)
         verb    = self.get_verb(req)
 
         payload = self.get_payload(req)
@@ -338,7 +397,6 @@ module Chimp
         #  tasks.each do |task|
         #    q.push(group, task)
         #  end
-
         if verb == 'process' or verb == 'add'
           ChimpDaemon.instance.chimp_queue.push payload
           id = 0
@@ -347,7 +405,9 @@ module Chimp
           q.get_job(job_id).status = payload.status
         end
 
+
         resp.body = {
+          'job_uuid' => job_uuid ,
           'id' => id
         }.to_yaml
 
@@ -444,6 +504,10 @@ module Chimp
     # DisplayServlet
     #
     class DisplayServlet < GenericServlet
+      #
+      # do_GET
+      #
+
       def do_GET(req, resp)
         #
         # First determine the path to the files to serve
@@ -493,5 +557,6 @@ module Chimp
         end
       end
     end # DisplayServlet
+
   end # ChimpDaemon
 end

data/lib/right_chimp/daemon/ChimpDaemonClient.rb

@@ -7,51 +7,59 @@ module Chimp
     #
     # Submit a Chimp object to a remote chimpd
     #
-    def self.submit(host, port, chimp_object)
+    def self.submit(host, port, chimp_object, job_uuid)
       uri = "http://#{host}:#{port}/job/process"
       attempts = 3
 
       begin
+        # We are sending to the chimp host+port the actual chimp_object.
+        Log.debug "Sending job to chimpd webserver"
         response = RestClient.post uri, chimp_object.to_yaml
 
+
         if response.code > 199 and response.code < 300
+          Log.debug "Response code was #{response.code}"
           id = YAML::load(response.body)['id']
+          #ID changes upon execution, not upon submission.
+          job_uuid = YAML::load(response.body)['job_uuid']
+          puts "["+job_uuid+"]"
           return true
         else
-          $stderr.puts "WARNING: error submitting to chimpd! response code: #{reponse.code}"
+          $stderr.puts "["+job_uuid+"] WARNING: error submitting to chimpd! response code: #{response.code}"
           return false
         end
 
       rescue RestClient::RequestTimeout => ex
-        $stderr.puts "WARNING: Request timeout talking to chimpd for job #{chimp_object.script}: #{ex.message} (#{ex.http_code})"
+        $stderr.puts "["+job_uuid+"] WARNING: Request timeout talking to chimpd for job #{chimp_object.script}: #{ex.message} (#{ex.http_code})"
         attempts -= 1
         sleep 5 and retry if attempts > 0
         return false
 
       rescue RestClient::InternalServerError => ex
-        $stderr.puts "WARNING: Error submitting job to chimpd: #{error_message}, retrying..."
+
+        $stderr.puts "["+job_uuid+"] WARNING: Error submitting job to chimpd: #{ex.message}, retrying..."
         attempts -= 1
         sleep 5 and retry if attempts > 0
         return false
 
       rescue Errno::ECONNRESET => ex
-        $stderr.puts "WARNING: Connection reset by peer, retrying..."
+        $stderr.puts "["+job_uuid+"] WARNING: Connection reset by peer, retrying..."
         attempts -= 1
         sleep 5 and retry if attempts > 0
         return false
 
       rescue Errno::EPIPE => ex
-        $stderr.puts "WARNING: broken pipe, retrying..."
+        $stderr.puts "["+job_uuid+"] WARNING: broken pipe, retrying..."
         attempts -= 1
         sleep 5 and retry if attempts > 0
         return false
 
       rescue Errno::ECONNREFUSED => ex
-        $stderr.puts "ERROR: connection refused, aborting"
+        $stderr.puts "["+job_uuid+"] ERROR: connection refused, aborting"
         return false
 
       rescue RestClient::Exception => ex
-        $stderr.puts "ERROR: Error submitting job to chimpd #{chimp_object.script}: #{ex.message}"
+        $stderr.puts "["+job_uuid+"] ERROR: Error submitting job to chimpd #{chimp_object.script}: #{ex.message}"
         return false
       end
     end

data/lib/right_chimp/exec/ExecReport.rb

@@ -2,15 +2,14 @@
 # Report
 #
 # :fields is a comma seperated list of fields to report on,
-# and are taken from the RestConnection Server objects directly.
-#
-# Example: ip-address,name,href,private-ip-address,aws-id,ec2-instance-type,dns-name,locked
 #
+# Example: ip-address,name,href,private-ip-address,resource_uid,
+# ec2-instance-type,datacenter,dns-name,locked,tag=foo
 module Chimp
   class ExecReport < Executor
     attr_reader :server, :fields
     attr_writer :server, :fields
-    
+
     def info
       return "report on server #{fields.inspect}"
     end
@@ -18,38 +17,33 @@ module Chimp
     def run
       run_with_retry do
         output = []
-        
-        #
-        # The API and rest_connection return very different data
-        # depending on the API call made (here, tag query vs. array)
-        # so the logic to load the server information and tags is
-        # messy.
-        #
+
         begin
-          s = Server.find(@server.href)
-          s.settings
-          response = ::Tag.search_by_href(s.current_instance_href)
+          s=@server
+          Log.debug "Making API 1.5 call: client.tags"
+          response=Connection.client.tags.by_resource(:resource_hrefs => [@server.href]).first.tags
         rescue Exception => ex
+          raise e
           s = @server
-          response = ::Tag.search_by_href(s.href)
+          response = nil
         end
 
-        s.tags = [] unless s.tags
+        s.params["tags"] = [] unless s.params["tags"]
         response.each do |t|
-          s.tags += [ t['name'] ]
+          s.params["tags"] += [ t['name'] ]
         end
-        
+
         @fields.split(",").each do |f|
           if f =~ /^tag=([^,]+)/
             tag_search_string = $1
-            s.tags.each do |tag|
+            s.params["tags"].each do |tag|
               output << tag if tag =~ /^#{tag_search_string}/
             end
           else
             output << s.params[f]
           end
         end
-        
+
         puts output.join(",")
       end
     end

data/lib/right_chimp/exec/ExecRightScript.rb

@@ -13,22 +13,23 @@ module Chimp
       end
     
       run_with_retry do
-        audit_entry = server.run_executable(@exec, options)
-        audit_entry.wait_for_state("completed", @timeout)
-        @results = audit_entry.summary
+        task=Task.new
+        task.tasker = @server.run_executable(@exec, options)
+        task.wait_for_state("completed", @timeout)
+        @results = task.tasker.show.summary
       end
     end
     
     def describe_work
-      return "ExecRightScript job_id=#{@job_id} script=\"#{@exec['right_script']['name']}\" server=\"#{@server['nickname']}\""
+      return "[#{@job_uuid}] ExecRightScript job_id=#{@job_id} script=\"#{@exec.params['right_script']['name']}\" server=\"#{@server.nickname}\""
     end
     
     def info
-      return @exec['right_script']['name']
+      return @exec.params['right_script']['name']
     end
     
     def target
-      return @server['nickname']
+      return @server.nickname
     end
     
   end

data/lib/right_chimp/exec/ExecSSH.rb

@@ -11,14 +11,9 @@ module Chimp
     end
     
     def run
-      host = @server['ip_address'] || @server['ip-address'] || nil
+      host = @server.ip_address || nil
       @ssh_user ||= "root"
-      
-      if host == nil
-        @server.settings
-        host = @server['ip_address'] || @server['ip-address']
-      end
-      
+
       run_with_retry do
         Log.debug "ssh #{@ssh_user}@#{host} \"#{@exec}\""
         success = system("ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{@ssh_user}@#{host} \"#{@exec}\"")
@@ -30,7 +25,7 @@ module Chimp
     end
     
     def describe_work
-      return "ExecSSH job_id=#{@job_id} command=\"#{@exec}\" server=\"#{@server['nickname']}\""
+      return "ExecSSH job_id=#{@job_id} command=\"#{@exec}\" server=\"#{@server.nickname}\""
     end
     
     def info
@@ -38,7 +33,7 @@ module Chimp
     end
     
     def target
-      return @server['nickname']
+      return @server.nickname
     end
     
   end

data/lib/right_chimp/exec/Executor.rb

@@ -5,7 +5,7 @@
 module Chimp
   class Executor
     attr_accessor :server, :array, :exec, :inputs, :template, :owner, :group,
-                  :job_id, :status, :dry_run, :verbose, :quiet, :timeout,
+                  :job_id, :job_uuid, :status, :dry_run, :verbose, :quiet, :timeout,
                   :retry_count, :retry_sleep, :time_start, :time_end, :error
     
     attr_reader   :results
@@ -23,6 +23,7 @@ module Chimp
       @template = h[:template]        || nil
 
       @job_id = h[:job_id]            || nil
+      @job_uuid = h[:job_uuid]        || nil
       @group = h[:group]              || nil
       @exec = h[:exec]                || nil
       @inputs = h[:inputs]            || nil
@@ -105,6 +106,7 @@ module Chimp
 
       @status = STATUS_RUNNING
       @time_start = Time.now
+
       Log.info self.describe_work_start unless @quiet
       
       #
@@ -124,7 +126,7 @@ module Chimp
             @status = STATUS_DONE
             @group.job_completed
           else
-            Log.warn "Ownership of job_id #{job_id} lost. User cancelled operation?"
+            Log.warn "[#{@job_uuid}] Ownership of job_id #{job_id} lost. User cancelled operation?"
           end
         
         rescue SystemExit, Interrupt => ex
@@ -138,7 +140,7 @@ module Chimp
         
           if @retry_count > 0
             @status = STATUS_RETRYING
-            Log.error "Error executing on \"#{name}\". Retrying in #{@retry_sleep} seconds..."
+            Log.error "[#{@job_uuid}] Error executing on \"#{name}\". Retrying in #{@retry_sleep} seconds..."
             @retry_count -= 1
             sleep @retry_sleep
             retry
@@ -146,7 +148,7 @@ module Chimp
         
           @status = STATUS_ERROR
           @error = ex
-          Log.error "Error executing on \"#{name}\": #{ex}"
+          Log.error "[#{@job_uuid}] Error executing on \"#{name}\": #{ex}"
           
         ensure 
           @time_end = Time.now
@@ -154,7 +156,7 @@ module Chimp
         end
         
       rescue RuntimeError => ex
-        Log.error "Caught RuntimeError: #{ex}. Aborting job."
+        Log.error "[#{@job_uuid}] Caught RuntimeError: #{ex}. Aborting job."
         Log.error ex.inspect
         Log.error ex.backtrace
         @status = STATUS_ERROR