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

add service filter for logentry

parent 3832f75b
No related branches found
No related tags found
1 merge request!350SDC-1313 ancillary dataproducts to dcache (ATDB side)
Pipeline #78407 failed
......@@ -233,19 +233,20 @@ class Task(models.Model):
# when a task goes to PROCESSED...
if (self.status != State.PROCESSED.value) & (self.new_status == State.PROCESSED.value):
# only when the tasks are not yet aggregated
if self.activity.status != State.AGGREGATED.value:
# ...but only when the tasks of this activity are not yet aggregated
# (because the aggregator service also sets tasks back to processed)
if (self.activity.status != State.AGGREGATED.value):
# check if this task is a summary task
self.is_summary = check_if_summary(self)
# if so, temporarily put it on hold so that the ancillary service can play with it
# if so, temporarily put it on hold so that the ancillary service can grab it with it
if self.is_summary:
# 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
# TODO: uncomment this, but I don't want to have it accidentally active without
# the summary service available and running to resume it.
# TODO: (un)comment this
# We don't want ATDB holding tasks without a aggregator service in place to resume
self.resume = False
# TODO: Q: should ATDB do this? or the aggregator service?
......
......@@ -155,6 +155,7 @@ class LogEntryFilter(filters.FilterSet):
fields = {
'task__id': ['exact'],
'service': ['exact', 'icontains', 'in'],
'step_name': ['exact', 'icontains', 'in', 'startswith'],
'status': ['exact', 'in'],
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment