From 723995cf2ff0f7ad0c0f1f24d73865603c2136dc Mon Sep 17 00:00:00 2001 From: Jacob Freck Date: Fri, 7 Dec 2018 12:22:41 -0800 Subject: [PATCH] Fix: Storage table never deleted (#690) * fix bad detection of table existence, delete if exist * remove unused import * fix double retry logic --- aztk/client/cluster/helpers/delete.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/aztk/client/cluster/helpers/delete.py b/aztk/client/cluster/helpers/delete.py index 1cbc13a7..d996453c 100644 --- a/aztk/client/cluster/helpers/delete.py +++ b/aztk/client/cluster/helpers/delete.py @@ -20,7 +20,7 @@ def delete_pool_and_job_and_table(core_cluster_operations, pool_id: str, keep_lo pool_exists = core_cluster_operations.batch_client.pool.exists(pool_id) - table_exists = core_cluster_operations.table_service.exists(pool_id) + table_deleted = core_cluster_operations.delete_task_table(pool_id) if job_exists: delete_object(core_cluster_operations.batch_client.job.delete, pool_id) @@ -28,14 +28,11 @@ def delete_pool_and_job_and_table(core_cluster_operations, pool_id: str, keep_lo if pool_exists: delete_object(core_cluster_operations.batch_client.pool.delete, pool_id) - if table_exists: - delete_object(core_cluster_operations.delete_task_table, pool_id) - if not keep_logs: cluster_data = core_cluster_operations.get_cluster_data(pool_id) cluster_data.delete_container(pool_id) - return job_exists or pool_exists or table_exists + return job_exists or pool_exists or table_deleted @retry(retry_count=4, retry_interval=1, backoff_policy=BackOffPolicy.exponential, exceptions=(ClientRequestError))