[CI] Test Runner: Update with latest wipe cluster settings

Author: picandocodigo

api-spec-testing/test_file.rb

@@ -32,6 +32,7 @@ class SkipTestsException < StandardError
     # @since 6.2.0
     class TestFile
       attr_reader :features_to_skip, :name, :client
+      LOGGER = Logger.new($stdout)
 
       # Initialize a single test file.
       #
@@ -49,9 +50,8 @@ def initialize(file_name, client, features_to_skip = [])
         begin
           documents = YAML.load_stream(File.new(file_name))
         rescue StandardError => e
-          logger = Logger.new($stdout)
-          logger.error e
-          logger.error "Filename : #{@name}"
+          LOGGER.error e
+          LOGGER.error "Filename : #{@name}"
         end
         @test_definitions = documents.reject { |doc| doc['setup'] || doc['teardown'] }
         @setup = documents.find { |doc| doc['setup'] }
@@ -84,6 +84,8 @@ def skip_version?(client, skip_definition)
       end
 
       def __parse_versions(versions)
+        versions = versions.split('-') if versions.is_a? String
+
         low = (['', nil].include? versions[0]) ? '0' : versions[0]
         high = (['', nil].include? versions[2]) ? '9999' : versions[2]
         [Gem::Version.new(low), Gem::Version.new(high)]
@@ -118,36 +120,24 @@ def setup
 
         actions = @setup['setup'].select { |action| action['do'] }.map { |action| Action.new(action['do']) }
         count = 0
-
-        actions.each do |action|
-          begin
-            action.execute(client)
-          rescue Elasticsearch::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
-
-            redo
-          rescue Elasticsearch::Transport::Transport::Errors::BadRequest,
-                 Elasticsearch::Transport::Transport::Errors::Conflict => e
-            error = JSON.parse(e.message.gsub(/\[[0-9]{3}\] /, ''))['error']['root_cause'].first
-            count += 1
-            raise e if count > 9
-
-            logger = Logger.new($stdout)
-            logger.error "#{error['type']}: #{error['reason']}"
-            if error['reason'] =~ /index \[.+\] already exists/
-              client.indices.delete(index: error['index'])
-            elsif (model_id_match = /Trained machine learning model \[([a-z-0-9]+)\] already exists/.match(error['reason']))
-              client.machine_learning.delete_trained_model(model_id: model_id_match[1])
+        loop do
+          actions.delete_if do |action|
+            begin
+              action.execute(client)
+              true
+            rescue Elasticsearch::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
-
-            sleep(1)
-            redo
           end
+          break if actions.empty?
         end
+
         self
       end
 
@@ -182,23 +172,24 @@ class << self
           'saml-service-provider', 'ilm-history', 'logs', 'logs-settings',
           'logs-mappings', 'metrics', 'metrics-settings', 'metrics-mappings',
           'synthetics', 'synthetics-settings', 'synthetics-mappings',
-          '.snapshot-blob-cache', '.deprecation-indexing-mappings', '.deprecation-indexing-settings'
+          '.snapshot-blob-cache', '.deprecation-indexing-template',
+          '.deprecation-indexing-mappings', '.deprecation-indexing-settings'
         ].freeze
 
         # Wipe Cluster, based on PHP's implementation of ESRestTestCase.java:wipeCluster()
         # https://github.com/elastic/elasticsearch-php/blob/7.10/tests/Elasticsearch/Tests/Utility.php#L97
         def wipe_cluster(client)
           if xpack?
             clear_rollup_jobs(client)
-            wait_for_pending_tasks(client)
             clear_sml_policies(client)
+            wait_for_pending_tasks(client)
           end
           clear_snapshots_and_repositories(client)
           clear_datastreams(client) if xpack?
           clear_indices(client)
           if xpack?
-            clear_datafeeds(client)
             clear_templates_xpack(client)
+            clear_datafeeds(client)
             clear_ml_jobs(client)
           else
             client.indices.delete_template(name: '*')
@@ -212,8 +203,8 @@ def wipe_cluster(client)
           clear_ilm_policies(client)
           clear_auto_follow_patterns(client)
           clear_tasks(client)
-          clear_indices(client)
           clear_transforms(client)
+          wait_for_cluster_tasks(client)
         end
 
         def xpack?
@@ -236,6 +227,25 @@ def wait_for_pending_tasks(client)
           end
         end
 
+        def wait_for_cluster_tasks(client)
+          tasks_filter = ['delete-index', 'remove-data-stream', 'ilm-history']
+          time = Time.now.to_i
+          count = 0
+
+          loop do
+            results = client.cluster.pending_tasks
+            results['tasks'].each do |task|
+              next if task.empty?
+
+              LOGGER.info "Pending task: #{task}"
+              tasks_filter.map do |filter|
+                count += 1 if task['source'].include? filter
+              end
+            end
+            break unless count.positive? && Time.now.to_i < (time + 30)
+          end
+        end
+
         def clear_sml_policies(client)
           policies = client.xpack.snapshot_lifecycle_management.get_lifecycle
 
@@ -252,10 +262,17 @@ def clear_ilm_policies(client)
         end
 
         def clear_cluster_settings(client)
-          # TODO
-          # settings = client.cluster.get_settings
-          # settings.each do |setting|
-          # end
+          settings = client.cluster.get_settings
+          new_settings = []
+          settings.each do |name, value|
+            next unless !value.empty? && value.is_a?(Array)
+
+            new_settings[name] = [] if new_settings[name].empty?
+            value.each do |key, _v|
+              new_settings[name]["#{key}.*"] = nil
+            end
+          end
+          client.cluster.put_settings(body: new_settings) unless new_settings.empty?
         end
 
         def clear_templates_xpack(client)
@@ -268,7 +285,7 @@ def clear_templates_xpack(client)
               client.indices.delete_template(name: template)
             rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
               if e.message.include?("index_template [#{template}] missing")
-                client.indices.delete_index_template(name: template)
+                client.indices.delete_index_template(name: template, ignore: 404)
               end
             end
           end
@@ -278,7 +295,7 @@ def clear_templates_xpack(client)
           result['component_templates'].each do |template|
             next if xpack_template? template['name']
 
-            client.cluster.delete_component_template(name: template['name'])
+            client.cluster.delete_component_template(name: template['name'], ignore: 404)
           end
         end
 
@@ -365,23 +382,34 @@ def clear_index_templates(client)
         end
 
         def clear_snapshots_and_repositories(client)
-          client.snapshot.get_repository(repository: '_all').keys.each do |repository|
-            client.snapshot.get(repository: repository, snapshot: '_all')['snapshots'].each do |s|
-              client.snapshot.delete(repository: repository, snapshot: s['snapshot'])
+          return unless (repositories = client.snapshot.get_repository)
+
+          repositories.each_key do |repository|
+            responses = client.snapshot.get(repository: repository, snapshot: '_all')['responses']
+            next unless responses
+
+            responses.each do |response|
+              response['snapshots'].each do |snapshot|
+                client.snapshot.delete(repository: repository, snapshot: snapshot['snapshot'])
+              end
             end
+
             client.snapshot.delete_repository(repository: repository)
           end
         end
 
         def clear_transforms(client)
-          client.data_frame.get_transform(transform_id: '*')['transforms'].each do |transform|
-            client.data_frame.delete_transform(transform_id: transform[:id])
+          client.transform.get_transform(transform_id: '*')['transforms'].each do |transform|
+            client.transform.delete_transform(transform_id: transform[:id])
           end
         end
 
         def clear_datastreams(client)
-          client.xpack.indices.delete_data_stream(name: '*', expand_wildcards: 'all')
-          client.indices.delete_data_stream(name: '*', expand_wildcards: 'all')
+          datastreams = client.xpack.indices.get_data_stream(name: '*', expand_wildcards: 'all')
+          datastreams['data_streams'].each do |datastream|
+            client.xpack.indices.delete_data_stream(name: datastream['name'], expand_wildcards: 'all')
+          end
+          client.indices.delete_data_stream(name: '*')
         end
 
         def clear_ml_filters(client)
@@ -392,21 +420,7 @@ def clear_ml_filters(client)
         end
 
         def clear_indices(client)
-          client.indices.delete(index: '*', expand_wildcards: 'all', ignore: 404)
-
-          indices = client.indices.get(index: '_all', expand_wildcards: 'all').keys.reject do |i|
-            i.start_with?('.security') || i.start_with?('.watches')
-          end
-          indices.each do |index|
-            client.indices.delete_alias(index: index, name: '*', ignore: 404) unless index.start_with?('.ds')
-            client.indices.delete(index: index, ignore: 404)
-          end
-        rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
-          raise e unless e.message.include?('is the write index for data stream')
-
-          error = JSON.parse(e.message.gsub(/\[[0-9]{3}\] /, ''))['error']['root_cause'].first
-          logger = Logger.new($stdout)
-          logger.error "#{error['type']}: #{error['reason']}"
+          client.indices.delete(index: '*,-.ds-ilm-history-*', expand_wildcards: 'open,closed,hidden', ignore: 404)
         end
       end
     end

elasticsearch-xpack/spec/xpack/rest_api_yaml_spec.rb

@@ -25,6 +25,8 @@
     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 test #{file}")
       next
     end
 
@@ -48,12 +50,12 @@
             before(:all) do
               begin
                 # watcher/get_watch/30_with_chain_input.yml needs to have a teardown deleting my_watch.
-                ADMIN_CLIENT.xpack.watcher.delete_watch(id: "my_watch")
+                ADMIN_CLIENT.xpack.watcher.delete_watch(id: 'my_watch')
               rescue Elasticsearch::Transport::Transport::Errors::NotFound
               end
               # todo: remove these two lines when Dimitris' PR is merged
-              ADMIN_CLIENT.cluster.put_settings(body: { transient: { "xpack.ml.max_model_memory_limit" => nil } })
-              ADMIN_CLIENT.cluster.put_settings(body: { persistent: { "xpack.ml.max_model_memory_limit" => nil } })
+              ADMIN_CLIENT.cluster.put_settings(body: { transient: { 'xpack.ml.max_model_memory_limit' => nil } })
+              ADMIN_CLIENT.cluster.put_settings(body: { persistent: { 'xpack.ml.max_model_memory_limit' => nil } })
               Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
               test_file.setup
             end