File tree 1 file changed +6
-2
lines changed
elasticsearch-api/api-spec-testing
1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ def ensure_no_initializing_shards(client)
99
99
100
100
def check_for_unexpectedly_recreated_objects ( client )
101
101
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 ) }
103
103
unless unexpected_ilm_policies . empty?
104
104
logger . info (
105
105
"Expected no ILM policies after deletions, but found #{ unexpected_ilm_policies . keys . join ( ',' ) } "
@@ -265,6 +265,10 @@ def platinum_template?(template)
265
265
PLATINUM_TEMPLATES . include? template
266
266
end
267
267
268
+ def preserve_policy? ( policy )
269
+ PRESERVE_ILM_POLICY_IDS . include? ( policy ) || policy . include? ( '@' )
270
+ end
271
+
268
272
def wait_for_cluster_tasks ( client )
269
273
start_time = Time . now . to_i
270
274
count = 0
@@ -293,7 +297,7 @@ def skippable_task?(task)
293
297
def delete_all_ilm_policies ( client )
294
298
policies = client . ilm . get_lifecycle
295
299
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 ] )
297
301
end
298
302
end
299
303
You can’t perform that action at this time.
0 commit comments