right_chimp 2.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb10edd310b0e400ce12bafcc0592b52928cdb6
-  data.tar.gz: d9a8ede4dfd0778475dbfcc26a38cacf55ada64b
+  metadata.gz: 98ed40eaf076ab7641a5a8d8fae25363bfb58428
+  data.tar.gz: 55957f53d165514a7ce2c205f5c2fd8633f54fad
 SHA512:
-  metadata.gz: 8d74afffc79fc7acc94041edd181e8b8f2f2cc60b7747e00004d6814b0edb556d0acd01c6613457c2efc917eccac03107171b3a0bbb7d721b33d9862784193ff
-  data.tar.gz: 1c2d8eeb42cb8e14245d767500cbd4dbff06b88e3a84e798ec84a3861d97639375fa6e08e838ac6086169f1a049601f3d6a1508aad014a9dade01e31be41e829
+  metadata.gz: 37e0b3980f158a0e0ef59ca1bb7ee808508e56c1d1e70b0ce31999e1fd16e3b37a4104c5fd09f5669290d8925d108be9be50fbc3f48a6b91656ebd1595e012b3
+  data.tar.gz: 08363318bf8ea6bda61ae086f9d132f55f7eb41c4751c62140c610d5b8971f5deb5d36c360ba99b0aa882c088294c2f20e6a21c2cbbc4e4332f4207ffb0590cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.2)
+    right_chimp (2.2.1)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)
@@ -73,4 +73,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.13.2
+   1.13.6

data/lib/right_chimp/{Chimp.rb → chimp.rb}

@@ -1,5 +1,5 @@
- #The Chimp class encapsulates the command-line program logic
 #
+# The Chimp class encapsulates the command-line program logic
 module Chimp
   class Chimp
     attr_accessor :concurrency, :delay, :retry_count, :hold, :progress, :prompt,
@@ -63,7 +63,7 @@ module Chimp
       @template         = nil
       @script           = nil
       @ssh              = nil
-      @ssh_user         = "rightscale"
+      @ssh_user         = 'rightscale'
       @report           = nil
       @inputs           = {}
       @set_tags         = []
@@ -276,14 +276,18 @@ module Chimp
             #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})"
             begin
+              tries ||= 3
               the_name = Connection.client.resource(s.params['right_script']['href'].scan(/=(.*)/).last.last).name
             rescue
-              Log.error "[#{Chimp.get_job_uuid}] Failed to make 1.5 call for rightscript href"
+              Log.error "[#{Chimp.get_job_uuid}] Failed to make 1.5 call for rightscript href (retrying)"
+              sleep 30
+              retry unless (tries -= 1).zero?
+              Log.error "[#{Chimp.get_job_uuid}] Failed to make 1.5 call for rightscript href (giving up)"
             end
             s.params['right_script']['name'] = the_name
-            @executable=s
+            @executable = s
           else
-            #If its not an url, go ahead try to locate it in the ST"
+            # If its not an url, go ahead try to locate it in the ST"
             @executable = detect_right_script(@server_template, @script)
           end
         else
@@ -592,8 +596,16 @@ module Chimp
         names.each do |array_name|
           # Find if arrays exist, if not raise warning.
           # One API call per array
-          Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.server_arrays.index(:filter => [#{array_name}])"
-          result = Connection.client.server_arrays.index(:filter => ["name==#{array_name}"])
+          begin
+            Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.server_arrays.index(:filter => [#{array_name}])"
+            tries ||= 3
+            result = Connection.client.server_arrays.index(:filter => ["name==#{array_name}"])
+          rescue
+            Log.error "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.server_arrays.index failed (retrying)."
+            sleep 30
+            retry unless (tries -= 1).zero?
+            Log.error "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.server_arrays.index failed (giving up)."
+          end
           # Result is an array with all the server arrays
           if result.size != 0
             if @exact
@@ -729,9 +741,12 @@ module Chimp
       st.each do |s|
         Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.resource(#{s[1]['href']})"
         begin
-          temp=Connection.client.resource(s[1]['href'])
+          tries ||= 3
+          temp = Connection.client.resource(s[1]['href'])
         rescue
           Log.error "[#{Chimp.get_job_uuid}] Failed to load href for ST"
+          sleep 30
+          retry unless (tries -= 1).zero?
         end
         temp.runnable_bindings.index.each do |x|
           # Look for first match
@@ -812,18 +827,22 @@ module Chimp
         #    "href"=>"/api/server_templates/351930003"} ]
         Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.resource (ST)"
         begin
-          temp=Connection.client.resource(s[1]['href'])
+          tries ||= 3
+          temp = Connection.client.resource(s[1]['href'])
           Log.debug "[#{Chimp.get_job_uuid}] API 1.5 call client.resource (ST) complete"
           temp.runnable_bindings.index.each do |x|
             # only add the operational ones
-            if x.sequence == "operational"
+            if x.sequence == 'operational'
               name = x.raw['right_script']['name']
               op_scripts.push([name, x])
             end
           end
         rescue  Exception => e
-          Log.error "[#{Chimp.get_job_uuid}] API 1.5 call client.resource (ST) failed"
+          Log.error "[#{Chimp.get_job_uuid}] API 1.5 call client.resource (ST) failed (retrying)"
           Log.error "[#{Chimp.get_job_uuid}] #{e.message}"
+          sleep 30
+          retry unless (tries -= 1).zero?
+          Log.error "[#{Chimp.get_job_uuid}] API 1.5 call client.resource (ST) failed (giving up)"
         end
       end
 
@@ -902,10 +921,14 @@ module Chimp
         # This will be useful for later on when we need to run scripts
         Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.resource (SERVER) for task creation"
         begin
+          tries ||= 3
           s.object = Connection.client.resource(server['href'])
           Log.debug "[#{Chimp.get_job_uuid}] Making API 1.5 call: client.resource (SERVER) for task creation COMPLETE"
         rescue
-          Log.error "[#{Chimp.get_job_uuid}] Failed to load server href via API1.5 for task creation"
+          Log.error "[#{Chimp.get_job_uuid}] Failed to load server href via API1.5 for task creation (retrying)"
+          sleep 30
+          retry unless (tries -= 1).zero?
+          Log.error "[#{Chimp.get_job_uuid}] Failed to load server href via API1.5 for task creation (giving up)"
         end
 
         e = nil

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = '2.2'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: 2.2.1
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,25 +147,25 @@ files:
 - docker/Dockerfile
 - docker/right_chimp.sh
 - lib/right_chimp.rb
-- lib/right_chimp/Chimp.rb
-- lib/right_chimp/Log.rb
+- lib/right_chimp/chimp.rb
 - lib/right_chimp/daemon/chimp_daemon.rb
 - lib/right_chimp/daemon/chimp_daemon_client.rb
-- lib/right_chimp/exec/Executor.rb
 - lib/right_chimp/exec/exec_array.rb
 - lib/right_chimp/exec/exec_callback.rb
 - lib/right_chimp/exec/exec_noop.rb
 - lib/right_chimp/exec/exec_report.rb
 - lib/right_chimp/exec/exec_rightscript.rb
 - lib/right_chimp/exec/exec_ssh.rb
+- lib/right_chimp/exec/executor.rb
 - lib/right_chimp/id_manager.rb
+- lib/right_chimp/log.rb
 - lib/right_chimp/queue/chimp_queue.rb
 - lib/right_chimp/queue/execution_group.rb
 - lib/right_chimp/queue/queue_worker.rb
-- lib/right_chimp/resources/Connection.rb
-- lib/right_chimp/resources/Executable.rb
-- lib/right_chimp/resources/Server.rb
-- lib/right_chimp/resources/Task.rb
+- lib/right_chimp/resources/connection.rb
+- lib/right_chimp/resources/executable.rb
+- lib/right_chimp/resources/server.rb
+- lib/right_chimp/resources/task.rb
 - lib/right_chimp/templates/all_jobs.erb
 - lib/right_chimp/templates/default.css
 - lib/right_chimp/templates/greenscreen.css