Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
atdb-ldv
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ASTRON SDC
atdb-ldv
Commits
1ce2cf8b
Commit
1ce2cf8b
authored
1 year ago
by
Nico Vermaas
Browse files
Options
Downloads
Patches
Plain Diff
add service filter for logentry
parent
3832f75b
No related branches found
No related tags found
1 merge request
!350
SDC-1313 ancillary dataproducts to dcache (ATDB side)
Pipeline
#78407
failed
1 year ago
Stage: test
Stage: build
Stage: deploy_to_test
Stage: deploy_to_production
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
atdb/taskdatabase/models.py
+7
-6
7 additions, 6 deletions
atdb/taskdatabase/models.py
atdb/taskdatabase/views.py
+1
-0
1 addition, 0 deletions
atdb/taskdatabase/views.py
with
8 additions
and
6 deletions
atdb/taskdatabase/models.py
+
7
−
6
View file @
1ce2cf8b
...
...
@@ -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?
...
...
This diff is collapsed.
Click to expand it.
atdb/taskdatabase/views.py
+
1
−
0
View file @
1ce2cf8b
...
...
@@ -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
'
],
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment