right_chimp 2.1.25.2 → 2.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa843d882c4a5c39bfafdf3f2471e04f53e371ea
-  data.tar.gz: 363785ffdfcd920a0185e2a794529a8a00022050
+  metadata.gz: 13cfa3ea1acbbd9d6efb16a1669723e8bd54e92c
+  data.tar.gz: 7ea4f5f61e66653e385ffa828eab2b344684f3c7
 SHA512:
-  metadata.gz: 0e637dea1de6011ca328a5d0300c611b68d3485949235b6bb388a2efca96485c4e1db8fab8901d4cf1be1c6988d441ad0f19edc46683512770fd423b8eb1a798
-  data.tar.gz: 853b8db1c921c869d70a2c2bdae364ecdffb1e13ecf4b2b1eec777151feb8c3128ac5f9ad8862481c62e0aa310cd10ceb6660371522bf87addcf04a2b2bf32a8
+  metadata.gz: 15dbb0cd8bcf16c882e0f8a65ca721a0ad6ebb58b693ed4182460aa234b429d9b782f0a21fb90597f47acd661b59e8751a8214b831b62291d817d0934c02ff68
+  data.tar.gz: 4dcdb39a3cbab65cb168e844c5ec01a0727bc361f7cabd88acfcfc922b1778727090e4c4012629790c6e006f28f86e705bdd768972f49ddf96b4ed315bcfea4b

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Metrics/LineLength:
+  Max: 110
+Metrics/MethodLength:
+  Max: 70
+Style/GlobalVars:
+  Enabled: false
+Style/BlockDelimiters:
+  Enabled: false

data/CHANGES

@@ -1,3 +1,8 @@
+Version 2.1.26
+--------------
+* Feature: Implemented the delay attribute for work_items of the Executor type, so they can be used when
+sending jobs to chimpd.
+
 Version 2.1.25.1
 --------------
 * Bugfix: Fixed standalone execution (without chimpd)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.25.2)
+    right_chimp (2.1.26)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)

data/lib/right_chimp/Chimp.rb

@@ -269,7 +269,9 @@ module Chimp
 
             script_number = File.basename(@script)
 
-            s=Executable.new
+            s = Executable.new
+            s.delay = @delay
+
             s.params['right_script']['href']="right_script_href=/api/right_scripts/"+script_number
             #Make an 1.5 call to extract name, by loading resource.
             Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call : client.resource(#{s.params['right_script']['href'].scan(/=(.*)/).last.last})"
@@ -715,7 +717,7 @@ module Chimp
             if self.job_uuid.nil?
               self.job_uuid = ""
             end
-            Log.warn "["+self.job_uuid+"]\"#{@script_to_run.params['right_script']['name']}\" is not a common operational script!"
+            Log.warn "["+self.job_uuid+"] \"#{@script_to_run.params['right_script']['name']}\" is not a common operational script!"
             return @script_to_run
           end
         end
@@ -917,6 +919,7 @@ module Chimp
             :job_notes => @job_notes,
             :inputs => @inputs,
             :timeout => @timeout,
+            :delay => @delay,
             :verbose => @@verbose,
             :quiet => @@quiet
           )
@@ -1131,22 +1134,31 @@ module Chimp
         Log.error '[' + job_uuid + '] Run manually!'
         Log.error '##################################################'
         return []
+      elsif @servers.first.nil? || @executable.nil?
+        Log.warn "[#{Chimp.get_job_uuid}] Nothing to do for \"chimp #{@cli_args}\"."
+        # decrease our counter
+        ChimpDaemon.instance.queue.processing[@group].delete(job_uuid.to_sym)
+        ChimpDaemon.instance.proc_counter -= 1
+        return []
       else
-        if @servers.first.nil? || @executable.nil?
-          Log.warn "[#{Chimp.get_job_uuid}] Nothing to do for \"chimp #{@cli_args}\"."
-          # decrease our counter
-          ChimpDaemon.instance.queue.processing[@group].delete(job_uuid.to_sym)
-          ChimpDaemon.instance.proc_counter -= 1
-          return []
-        else
-          Log.debug "[#{Chimp.get_job_uuid}] Generating job(s)..."
-          Log.debug 'Increasing processing counter (' + ChimpDaemon.instance.proc_counter.to_s + ") + " +  @servers.size.to_s + ' for group ' + @group.to_s
-
-          ChimpDaemon.instance.queue.processing[@group][job_uuid.to_sym] += @servers.size
-          ChimpDaemon.instance.proc_counter += @servers.size - 1
-
-          return generate_jobs(@servers, @server_template, @executable)
-        end
+        Log.debug "[#{Chimp.get_job_uuid}] Generating job(s)..."
+        # @servers might be > 1, but we might be using limit_start
+        number_of_servers = if @limit_start.to_i > 0 || @limit_end.to_i > 0
+                              @limit_end.to_i - @limit_start.to_i
+                            else
+                              # reminder, we already are accounting for at least 1
+                              @servers.size - 1
+                            end
+        Log.debug 'Increasing processing counter (' + ChimpDaemon.instance.proc_counter.to_s + ') + ' +
+                  number_of_servers.to_s + ' for group ' + @group.to_s
+
+        ChimpDaemon.instance.queue.processing[@group][job_uuid.to_sym] += number_of_servers
+        ChimpDaemon.instance.proc_counter += number_of_servers
+
+        Log.debug 'Processing counter now (' + ChimpDaemon.instance.proc_counter.to_s + ') for group ' +
+                  @group.to_s
+
+        return generate_jobs(@servers, @server_template, @executable)
       end
     end
 
@@ -1159,7 +1171,7 @@ module Chimp
       d = default ? 'y' : 'n'
       until %w[y n].include? a
         a = ask("#{prompt} #{s} ") { |q| q.limit = 1; q.case = :downcase }
-        a = d if a.length == 0
+        a = d if a.length.zero?
       end
       a == 'y'
     end

data/lib/right_chimp/exec/ExecRightScript.rb

@@ -19,6 +19,7 @@ module Chimp
         task.tasker = @server.run_executable(@exec, options)
         @audit_entry_url = task.friendly_url
         task.wait_for_state('completed', @timeout)
+
         @results = task.state
         @audit_entry_data = task.details
       end
@@ -33,7 +34,7 @@ module Chimp
     end
 
     def target
-       @server.nickname
+      @server.nickname
     end
 
   end

data/lib/right_chimp/exec/Executor.rb

@@ -4,7 +4,7 @@
 
 module Chimp
   class Executor
-    attr_accessor :server, :array, :exec, :inputs, :template, :owner, :group,
+    attr_accessor :server, :array, :exec, :inputs, :template, :owner, :group, :delay,
                   :job_id, :job_uuid, :job_notes, :status, :dry_run, :verbose, :quiet, :timeout,
                   :retry_count, :retry_sleep, :time_start, :time_end, :error
 
@@ -36,6 +36,8 @@ module Chimp
       @retry_sleep = h[:retry_sleep].to_i || 30
       @timeout = h[:timeout].to_i         || 3600
 
+      @delay = h[:delay].to_i || 0
+
       @error = nil
       @status = STATUS_NONE
       @owner = nil
@@ -104,6 +106,14 @@ module Chimp
     #
     def run_with_retry(&block)
       Log.debug "Running job '#{@job_id}' with status '#{@status}'"
+      # If we are not the first job in this group, wait @delay
+      ChimpDaemon.instance.semaphore.synchronize do
+        if @group.started >= ChimpQueue.instance.max_threads && @delay.nonzero?
+          Log.info "[#{@job_uuid}] Sleeping #{@delay} seconds between tasks"
+          sleep @delay
+        end
+        @group.started += 1
+      end
 
       @status = STATUS_RUNNING
       @time_start = Time.now
@@ -131,7 +141,7 @@ module Chimp
           end
 
         rescue SystemExit, Interrupt => ex
-          $stderr.puts "Exiting!"
+          $stderr.puts 'Exiting!'
           raise ex
 
         rescue Interrupt => ex

data/lib/right_chimp/queue/ChimpQueue.rb

@@ -51,6 +51,7 @@ module Chimp
     def push(g, w)
       raise "no group specified" unless g
       create_group(g) if not ChimpQueue[g]
+
       ChimpQueue[g].push(w) unless ChimpQueue[g].get_job(w.job_id)
     end
 

data/lib/right_chimp/queue/ExecutionGroup.rb

@@ -22,7 +22,7 @@ module Chimp
   # should be used directly.
   #
   class ExecutionGroup
-    attr_accessor :group_id, :description, :concurrency
+    attr_accessor :group_id, :description, :concurrency, :started
     attr_reader   :time_start, :time_end
 
     def initialize(new_group_id=nil)
@@ -33,6 +33,7 @@ module Chimp
       @time_start = nil
       @time_end = nil
       @concurrency = 1
+      @started = 0
     end
 
     #
@@ -271,11 +272,16 @@ module Chimp
   #
   class SerialExecutionGroup < ExecutionGroup
     def ready?
-      return get_jobs_by_status(Executor::STATUS_RUNNING).size == 0 && get_jobs_by_status(Executor::STATUS_NONE).size > 0
+      # Make sure only one thread makes the ready question at the same time,
+      # otherwise we can run into race conditions. This is critical for SerialExecutionGroup
+      ChimpDaemon.instance.semaphore.synchronize do
+        ready = get_jobs_by_status(Executor::STATUS_RUNNING).size == 0 && get_jobs_by_status(Executor::STATUS_NONE).size > 0
+        return ready
+      end
     end
 
     def short_name
-      "S"
+      'S'
     end
   end
 

data/lib/right_chimp/queue/QueueWorker.rb

@@ -22,6 +22,7 @@ module Chimp
 
         begin
           if work_item != nil
+
             job_uuid = work_item.job_uuid
             group = work_item.group.group_id
 
@@ -29,19 +30,25 @@ module Chimp
             work_item.owner = Thread.current.object_id
 
             ChimpDaemon.instance.semaphore.synchronize do
-              # remove from the processing queue
-              Log.debug 'Decreasing processing counter (' + (ChimpDaemon.instance.proc_counter-1).to_s + ') for [' + job_uuid.to_s + '] group: ' + group.to_s
               # only do this if we are running with chimpd
               if ChimpDaemon.instance.queue.processing[group].nil?
                 # no op
               else
-                ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym] -= 1
-                Log.debug ChimpDaemon.instance.queue.processing[group].inspect
+                # remove from the processing queue
                 if ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym] == 0
                   Log.debug 'Completed processing task ' + job_uuid.to_s
+                  Log.debug 'Deleting ' + job_uuid.to_s
                   ChimpDaemon.instance.queue.processing[group].delete(job_uuid.to_sym)
                   Log.debug ChimpDaemon.instance.queue.processing.inspect
                 else
+                  Log.debug 'Decreasing processing counter (' + ChimpDaemon.instance.proc_counter.to_s +
+                            ') for [' + job_uuid.to_s + '] group: ' + group.to_s
+
+                  ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym] -= 1
+
+                  Log.debug 'Processing counter now (' + ChimpDaemon.instance.proc_counter.to_s +
+                            ') for [' + job_uuid.to_s + '] group: ' + group.to_s
+                  Log.debug ChimpDaemon.instance.queue.processing[group].inspect
                   Log.debug 'Still counting down for ' + job_uuid.to_s
                 end
                 ChimpDaemon.instance.proc_counter -= 1
@@ -49,7 +56,6 @@ module Chimp
             end
 
             work_item.run
-            sleep @delay
           else
             sleep 1
           end

data/lib/right_chimp/resources/Executable.rb

@@ -6,9 +6,7 @@ module Chimp
   # This task contains parameters that describe a script/task to be executed
   #
   class Executable
-
-    attr_writer :params
-    attr_reader :params
+    attr_accessor :params, :delay
 
     def initialize
       @params = {
@@ -23,9 +21,10 @@ module Chimp
           "name"=>"dummy_name",
           "description"=>"dummy_description"
           },
-          "recipe"=>nil,
-          "apply"=>"operational"
+        "recipe"=>nil,
+        "apply"=>"operational"
         }
+        @delay = 0
     end
 
     def href

data/lib/right_chimp/resources/Task.rb

@@ -13,11 +13,11 @@ module Chimp
     def wait_for_state(desired_state, timeout=900)
       while(timeout > 0)
         state=self.tasker.show.summary
-      return true if self.state.match(desired_state)
+        return true if self.state.match(desired_state)
         friendly_url = Connection.audit_url + '/audit_entries/'
         friendly_url += self.href.split(/\//).last
         friendly_url = friendly_url.gsub('ae-', '')
-        raise "FATAL error, #{tasker.show.summary}\n\n Audit: #{friendly_url}'\n " if self.state.match("failed")
+        raise "FATAL error, #{tasker.show.summary}\n\n Audit: #{friendly_url}\n " if self.state.match("failed")
         sleep 30
         timeout -= 30
       end

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.25.2"
+  VERSION = "2.1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.25.2
+  version: 2.1.26
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGES
 - Gemfile
@@ -200,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: RightScale platform command-line tool