Skip to content

Commit 7417cd9

Browse files
committed
[API] Test Runner: Refactors ILM policies in wipe cluster
1 parent 830a5f2 commit 7417cd9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def ensure_no_initializing_shards(client)
9999

100100
def check_for_unexpectedly_recreated_objects(client)
101101
unexpected_ilm_policies = client.index_lifecycle_management.get_lifecycle
102-
unexpected_ilm_policies.reject! { |k, _| PRESERVE_ILM_POLICY_IDS.include? k }
102+
unexpected_ilm_policies.reject! { |k, _| preserve_policy?(k) }
103103
unless unexpected_ilm_policies.empty?
104104
logger.info(
105105
"Expected no ILM policies after deletions, but found #{unexpected_ilm_policies.keys.join(',')}"
@@ -265,6 +265,10 @@ def platinum_template?(template)
265265
PLATINUM_TEMPLATES.include? template
266266
end
267267

268+
def preserve_policy?(policy)
269+
PRESERVE_ILM_POLICY_IDS.include?(policy) || policy.include?('@')
270+
end
271+
268272
def wait_for_cluster_tasks(client)
269273
start_time = Time.now.to_i
270274
count = 0
@@ -293,7 +297,7 @@ def skippable_task?(task)
293297
def delete_all_ilm_policies(client)
294298
policies = client.ilm.get_lifecycle
295299
policies.each do |policy|
296-
client.ilm.delete_lifecycle(policy: policy[0]) unless PRESERVE_ILM_POLICY_IDS.include? policy[0]
300+
client.ilm.delete_lifecycle(policy: policy[0]) unless preserve_policy?(policy[0])
297301
end
298302
end
299303

0 commit comments

Comments
 (0)