Skip to content

Commit 798d8d5

Browse files
committed
[Test Runner] Updates wipe cluster
Adds wait_for_completion=false, build is timing out on deleting jobs and datafeeds. Adds force: true and timeout to avoid duplicated entities.
1 parent 59e3768 commit 798d8d5

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -414,24 +414,27 @@ def clear_privileges(client)
414414
def clear_ml_jobs(client)
415415
client.ml.close_job(job_id: '_all', force: true)
416416
client.ml.get_jobs['jobs'].each do |d|
417-
client.ml.delete_job(job_id: d['job_id'])
417+
client.ml.delete_job(job_id: d['job_id'], wait_for_completion: false, force: true)
418418
end
419419
end
420420

421421
def clear_datafeeds(client)
422422
client.ml.stop_datafeed(datafeed_id: '_all', force: true)
423423
client.ml.get_datafeeds['datafeeds'].each do |d|
424-
client.ml.delete_datafeed(datafeed_id: d['datafeed_id'])
424+
client.ml.stop_datafeed(datafeed_id: d['datafeed_id'], force: true)
425+
begin
426+
client.ml.delete_datafeed(datafeed_id: d['datafeed_id'], force: true)
427+
rescue StandardError => e
428+
logger.info(e)
429+
end
425430
end
426431
end
427432

428433
def clear_tasks(client)
429434
tasks = client.tasks.get['nodes'].values.first['tasks'].values.select do |d|
430435
d['cancellable']
431-
end.map do |d|
432-
"#{d['node']}:#{d['id']}"
433436
end
434-
tasks.each { |t| client.tasks.cancel task_id: t }
437+
tasks.each { |d| client.tasks.cancel(task_id: "#{d['node']}:#{d['id']}") }
435438
end
436439

437440
def clear_machine_learning_indices(client)
@@ -448,7 +451,7 @@ def clear_index_templates(client)
448451

449452
def clear_transforms(client)
450453
client.transform.get_transform(transform_id: '*')['transforms'].each do |transform|
451-
client.transform.delete_transform(transform_id: transform['id'])
454+
client.transform.delete_transform(transform_id: transform['id'], force: true)
452455
end
453456
end
454457

@@ -482,7 +485,7 @@ def delete_trained_models(client)
482485
return unless models['trained_model_configs']
483486

484487
models['trained_model_configs'].each do |model|
485-
client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400)
488+
client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400, timeout: '120s')
486489
end
487490
end
488491
end

0 commit comments

Comments
 (0)