Skip to content

Commit 8de4fd4

Browse files
authored
Merge pull request #640 from hmcts/feature-error-handling-deleting-tables
Add error handling on deletion of files incase they have already been…
2 parents 1f5ba90 + bdc9af3 commit 8de4fd4

1 file changed

Lines changed: 30 additions & 12 deletions

File tree

Databricks/ACTIVE/MVP/Active_Publish_EH_HTML_JSON.ipynb

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,23 +281,41 @@
281281
"states = [\"paymentPending\"]\n",
282282
"\n",
283283
"for state in states:\n",
284-
" spark.sql(f\"DELETE FROM delta.`abfss://{silver_curated_container}@{curated_storage_account}.dfs.core.windows.net/ARIADM/ACTIVE/CCD/APPEALS/{state}/publish_audit_db_eh` WHERE true\")\n",
285-
" logger.info(f\"{state}: old data successfully deleted from publish_audit_db_eh\")\n",
284+
" try:\n",
285+
" spark.sql(f\"DELETE FROM delta.`abfss://{silver_curated_container}@{curated_storage_account}.dfs.core.windows.net/ARIADM/ACTIVE/CCD/APPEALS/{state}/publish_audit_db_eh` WHERE true\")\n",
286+
" logger.info(f\"{state}: old data successfully deleted from publish_audit_db_eh\")\n",
287+
" except Exception as e:\n",
288+
" logger.warning(f\"{state}: Could not delete data from publish_audit_db_eh - {e}\")\n",
286289
"\n",
287-
"spark.sql(\"TRUNCATE TABLE hive_metastore.paymentpending_gold.dashboard_segmentation_state\")\n",
288-
"logger.info(\"dashboard_segmentation_state table truncated\")\n",
290+
"try:\n",
291+
" spark.sql(\"TRUNCATE TABLE hive_metastore.paymentpending_gold.dashboard_segmentation_state\")\n",
292+
" logger.info(\"dashboard_segmentation_state table truncated\")\n",
293+
"except Exception as e:\n",
294+
" logger.warning(f\"Could not truncate dashboard_segmentation_state as data does not exist - {e}\")\n",
289295
"\n",
290-
"spark.sql(\"TRUNCATE TABLE hive_metastore.paymentpending_gold.dashboard_valid_json_files\")\n",
291-
"logger.info(\"dashboard_valid_json_files table truncated\")\n",
296+
"try:\n",
297+
" spark.sql(\"TRUNCATE TABLE hive_metastore.paymentpending_gold.dashboard_valid_json_files\")\n",
298+
" logger.info(\"dashboard_valid_json_files table truncated\")\n",
299+
"except Exception as e:\n",
300+
" logger.warning(f\"Could not truncate dashboard_valid_json_files as data does not exist - {e}\")\n",
292301
"\n",
293-
"spark.sql(\"TRUNCATE TABLE hive_metastore.paymentpending_gold.dashboard_invalid_json_files\")\n",
294-
"logger.info(\"dashboard_invalid_json_files table truncated\")\n",
302+
"try:\n",
303+
" spark.sql(\"TRUNCATE TABLE hive_metastore.paymentpending_gold.dashboard_invalid_json_files\")\n",
304+
" logger.info(\"dashboard_invalid_json_files table truncated\")\n",
305+
"except Exception as e:\n",
306+
" logger.warning(f\"Could not truncate dashboard_invalid_json_files as data does not exist - {e}\")\n",
295307
"\n",
296-
"spark.sql(f\"DELETE FROM delta.`abfss://silver@ingest{lz_key}curated{env}.dfs.core.windows.net/ARIADM/ACTIVE/CCD/AUDIT/APPEALS/all_active_states/ack_audit` WHERE true\")\n",
297-
"logger.info(\"ack_audit data deleted\")\n",
308+
"try:\n",
309+
" spark.sql(f\"DELETE FROM delta.`abfss://silver@ingest{lz_key}curated{env}.dfs.core.windows.net/ARIADM/ACTIVE/CCD/AUDIT/APPEALS/all_active_states/ack_audit` WHERE true\")\n",
310+
" logger.info(\"ack_audit data deleted\")\n",
311+
"except Exception as e:\n",
312+
" logger.warning(f\"No ack audit data exists to delete - {e}\")\n",
298313
"\n",
299-
"spark.sql(f\"DELETE FROM delta.`abfss://{silver_curated_container}@{curated_storage_account}.dfs.core.windows.net/ARIADM/ACTIVE/CCD/APPEALS/publish_payload_audit` WHERE true\")\n",
300-
"logger.info(\"publish_payload_audit data deleted\")"
314+
"try:\n",
315+
" spark.sql(f\"DELETE FROM delta.`abfss://{silver_curated_container}@{curated_storage_account}.dfs.core.windows.net/ARIADM/ACTIVE/CCD/APPEALS/publish_payload_audit` WHERE true\")\n",
316+
" logger.info(\"publish_payload_audit data deleted\")\n",
317+
"except Exception as e:\n",
318+
" logger.warning(f\"No publish_payload_audit data exists to delete - {e}\")"
301319
]
302320
},
303321
{

0 commit comments

Comments
 (0)