Skip to content
Snippets Groups Projects
Commit 4aca0840 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

comment out 'hold' for this moment

parent b29baefe
Branches
No related tags found
1 merge request!350SDC-1313 ancillary dataproducts to dcache (ATDB side)
Pipeline #77779 failed
......@@ -240,7 +240,13 @@ class Task(models.Model):
# if so, temporarily put it on hold so that the ancillary service can play with it
if self.is_summary:
self.resume = False
# slightly bothered by the idea that ATDB puts it on HOLD and depends on the ancillary service
# to resume it. But users have earlier asked for the same dynamic for scrubbed. Acceptable
pass
# TODO: uncomment this, but I don't want to have it accidentally active without
# the summary service available and running to resume it.
#self.resume = False
# nv:20feb2024, same as above, but for backward compatibilty reasons.
# For tasks that are already beyond PROCESSED, but not yet ingested.
......
......@@ -38,6 +38,7 @@ class TestProcessedSummary(TestCase):
"""
actual = self.task2.resume
# this test fails, because "self.resume = False" is still commented out in models.py L249
self.assertEqual(actual, False)
def test_activity_is_processed(self):
......
......@@ -89,6 +89,7 @@ class TaskFilter(filters.FilterSet):
'predecessor__status': ['exact', 'icontains', 'in', 'startswith'],
'activity' : ['isnull'],
'activity__id': ['exact'],
'activity__status': ['exact', 'icontains', 'in', 'startswith'],
'activity__ingested_fraction' : ['exact','lt', 'lte', 'gt', 'gte','isnull'],
}
......@@ -130,6 +131,10 @@ class ActivityFilter(filters.FilterSet):
'finished_fraction': ['exact', 'lt', 'lte', 'gt', 'gte'],
'total_size': ['exact', 'lt', 'lte', 'gt', 'gte'],
'remaining': ['exact', 'lt', 'lte', 'gt', 'gte'],
'is_processed': ['exact'],
'is_verified': ['exact'],
'is_validated': ['exact'],
'is_combined': ['exact'],
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment