Merge pull request #3200 from mytardis/mt-409-dfo-does-not-exist

[MT-409] Do not raise DoesNotExist error if object is missing
mytardis · Aug 9, 2021 · 5186bf6 · 5186bf6
2 parents 2e4e051 + 17d4290
commit 5186bf6
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/tardis/tardis_portal/tasks.py b/tardis/tardis_portal/tasks.py
@@ -216,10 +216,17 @@ def dfo_verify(dfo_id, *args, **kwargs):
     # Get dfo locked for write (to prevent concurrent actions)
     if kwargs.pop('transaction_lock', False):
         with transaction.atomic():
-            dfo = DataFileObject.objects.select_for_update().get(id=dfo_id)
-            return dfo.verify(*args, **kwargs)
-    dfo = DataFileObject.objects.get(id=dfo_id)
-    return dfo.verify(*args, **kwargs)
+            try:
+                dfo = DataFileObject.objects.select_for_update().get(id=dfo_id)
+                return dfo.verify(*args, **kwargs)
+            except DataFileObject.DoesNotExist:
+                pass
+    try:
+        dfo = DataFileObject.objects.get(id=dfo_id)
+        return dfo.verify(*args, **kwargs)
+    except DataFileObject.DoesNotExist:
+        pass
+    return False
 
 
 @tardis_app.task(name='tardis_portal.clear_sessions', ignore_result=True)