Skip to content

Commit 868877a

Browse files
committed
[Test Runner] Updates wipe_cluster
Removes timeout, deletes datafeeds in Thread
1 parent b147151 commit 868877a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,11 +448,11 @@ def clear_ml_jobs(client)
448448
def clear_datafeeds(client)
449449
client.ml.stop_datafeed(datafeed_id: '_all', force: true)
450450
client.ml.get_datafeeds['datafeeds'].each do |d|
451-
client.ml.stop_datafeed(datafeed_id: d['datafeed_id'], force: true)
452-
begin
451+
Thread.new do
452+
client.ml.stop_datafeed(datafeed_id: d['datafeed_id'], force: true)
453453
client.ml.delete_datafeed(datafeed_id: d['datafeed_id'], force: true)
454-
rescue StandardError => e
455-
logger.info(e)
454+
rescue StandardError
455+
logger.info('Exception deleting datafeed')
456456
end
457457
end
458458
end
@@ -512,7 +512,7 @@ def delete_trained_models(client)
512512
return unless models['trained_model_configs']
513513

514514
models['trained_model_configs'].each do |model|
515-
client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400, timeout: '120s')
515+
client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400)
516516
end
517517
end
518518
end

0 commit comments

Comments
 (0)