[API] Test Runner: Retry actions when server returns timeout or is unavailable

Author: picandocodigo

elasticsearch-api/api-spec-testing/test_file.rb

@@ -118,25 +118,7 @@ def setup
         return unless @setup
 
         actions = @setup['setup'].select { |action| action['do'] }.map { |action| Action.new(action['do']) }
-        count = 0
-        loop do
-          actions.delete_if do |action|
-            begin
-              action.execute(client)
-              true
-            rescue Elastic::Transport::Transport::Errors::ServiceUnavailable => e
-              # The action sometimes gets the cluster in a recovering state, so we
-              # retry a few times and then raise an exception if it's still
-              # happening
-              count += 1
-              raise e if count > 9
-
-              false
-            end
-          end
-          break if actions.empty?
-        end
-
+        run_actions_and_retry(actions)
         self
       end
 
@@ -154,9 +136,39 @@ def teardown
         return unless @teardown
 
         actions = @teardown['teardown'].select { |action| action['do'] }.map { |action| Action.new(action['do']) }
-        actions.each { |action| action.execute(client) }
+        run_actions_and_retry(actions)
         self
       end
+
+      # Helper function to run actions. If the server returns an error, give it some time and retry
+      # for a few times.
+      def run_actions_and_retry(actions)
+        count = 0
+        loop do
+          actions.delete_if do |action|
+            begin
+              action.execute(client)
+              true
+            rescue Elastic::Transport::Transport::Errors::RequestTimeout,
+                   Elastic::Transport::Transport::Errors::ServiceUnavailable => e
+              # The action sometimes gets the cluster in a recovering state, so we
+              # retry a few times and then raise an exception if it's still
+              # happening
+              count += 1
+              sleep 10
+              Elasticsearch::RestAPIYAMLTests::Logging.logger.debug(
+                "The server responded with an #{e.class} error. Retrying action - (#{count})"
+              )
+              raise e if count > 11
+
+              false
+            end
+          end
+          break if actions.empty?
+        end
+
+      end
+
     end
   end
 end

elasticsearch-api/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -19,10 +19,10 @@
 require 'rest_api_tests_helper'
 
 describe 'Rest API YAML tests' do
+  LOGGER = Logger.new($stdout)
   if REST_API_YAML_FILES.empty?
-    logger = Logger.new($stdout)
-    logger.error 'No test files found!'
-    logger.info 'Use rake rake elasticsearch:download_artifacts in the root directory of the project to download the test artifacts.'
+    LOGGER.error 'No test files found!'
+    LOGGER.info 'Use rake rake elasticsearch:download_artifacts in the root directory of the project to download the test artifacts.'
     exit 1
   end
 
@@ -33,8 +33,7 @@
     rescue SkipTestsException => _e
       # If the test file has a `skip` at the top level that applies to this
       # version of Elasticsearch, continue with the next text.
-      logger = Logger.new($stdout)
-      logger.info "Skipping #{file} due to 'skip all'."
+      LOGGER.info "Skipping #{file} due to 'skip all'."
       next
     end
 
@@ -153,4 +152,3 @@
     end
   end
 end
-