From 6ff4dca52c413e66da10cac1fe3b5c7c3ee4315c Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@archive.org>
Date: Fri, 18 Feb 2022 19:42:17 -0800
Subject: ingest: handle more fileset failure modes
---
python/sandcrawler/fileset_strategies.py | 6 +++++-
python/sandcrawler/ingest_fileset.py | 27 +++++++++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
(limited to 'python')
diff --git a/python/sandcrawler/fileset_strategies.py b/python/sandcrawler/fileset_strategies.py
index 9bca551..cccc061 100644
--- a/python/sandcrawler/fileset_strategies.py
+++ b/python/sandcrawler/fileset_strategies.py
@@ -338,7 +338,11 @@ class WebFilesetStrategy(FilesetIngestStrategy):
continue
file_meta = gen_file_metadata(resource.body)
- file_meta, _html_resource = fix_transfer_encoding(file_meta, resource)
+ try:
+ file_meta, _html_resource = fix_transfer_encoding(file_meta, resource)
+ except:
+ m.status = "transfer-encoding-error"
+ continue
if self.ingest_strategy == "web-file":
file_file_meta = file_meta
diff --git a/python/sandcrawler/ingest_fileset.py b/python/sandcrawler/ingest_fileset.py
index 7337043..56f1697 100644
--- a/python/sandcrawler/ingest_fileset.py
+++ b/python/sandcrawler/ingest_fileset.py
@@ -256,7 +256,7 @@ class IngestFilesetWorker(IngestFileWorker):
result["status"] = "wrong-mimetype"
return result
else:
- # raise NotImplementedError()
+ # eg, datasets, components, etc
pass
result["_html_biblio"] = html_biblio
@@ -378,7 +378,30 @@ class IngestFilesetWorker(IngestFileWorker):
return result
# 3. Use strategy-specific methods to archive all files in platform manifest, and verify manifest metadata.
- archive_result = strategy_helper.process(dataset_meta)
+ try:
+ archive_result = strategy_helper.process(dataset_meta)
+ except SavePageNowError as e:
+ result["status"] = "spn2-error"
+ result["error_message"] = str(e)[:1600]
+ return result
+ except PetaboxError as e:
+ result["status"] = "petabox-error"
+ result["error_message"] = str(e)[:1600]
+ return result
+ except CdxApiError as e:
+ result["status"] = "cdx-error"
+ result["error_message"] = str(e)[:1600]
+ # add a sleep in cdx-error path as a slow-down
+ time.sleep(2.0)
+ return result
+ except WaybackError as e:
+ result["status"] = "wayback-error"
+ result["error_message"] = str(e)[:1600]
+ return result
+ except WaybackContentError as e:
+ result["status"] = "wayback-content-error"
+ result["error_message"] = str(e)[:1600]
+ return result
# 4. Summarize status and return structured result metadata.
result["status"] = archive_result.status
--
cgit v1.2.3