@@ -414,24 +414,22 @@ 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 )
422- client . ml . stop_datafeed ( datafeed_id : '_all' , force : true )
423422 client . ml . get_datafeeds [ 'datafeeds' ] . each do |d |
424- client . ml . delete_datafeed ( datafeed_id : d [ 'datafeed_id' ] )
423+ client . ml . stop_datafeed ( datafeed_id : d [ 'datafeed_id' ] , force : true , timeout : '120s' )
424+ client . ml . delete_datafeed ( datafeed_id : d [ 'datafeed_id' ] , force : true )
425425 end
426426 end
427427
428428 def clear_tasks ( client )
429429 tasks = client . tasks . get [ 'nodes' ] . values . first [ 'tasks' ] . values . select do |d |
430430 d [ 'cancellable' ]
431- end . map do |d |
432- "#{ d [ 'node' ] } :#{ d [ 'id' ] } "
433431 end
434- tasks . each { |t | client . tasks . cancel task_id : t }
432+ tasks . each { |d | client . tasks . cancel ( task_id : " #{ d [ 'node' ] } : #{ d [ 'id' ] } " ) }
435433 end
436434
437435 def clear_machine_learning_indices ( client )
@@ -448,7 +446,7 @@ def clear_index_templates(client)
448446
449447 def clear_transforms ( client )
450448 client . transform . get_transform ( transform_id : '*' ) [ 'transforms' ] . each do |transform |
451- client . transform . delete_transform ( transform_id : transform [ 'id' ] )
449+ client . transform . delete_transform ( transform_id : transform [ 'id' ] , force : true )
452450 end
453451 end
454452
@@ -482,7 +480,7 @@ def delete_trained_models(client)
482480 return unless models [ 'trained_model_configs' ]
483481
484482 models [ 'trained_model_configs' ] . each do |model |
485- client . ml . delete_trained_model ( model_id : model [ 'model_id' ] , force : true , ignore : 400 )
483+ client . ml . delete_trained_model ( model_id : model [ 'model_id' ] , force : true , ignore : 400 , timeout : '120s' )
486484 end
487485 end
488486 end
0 commit comments