From 9b3b494335da23a394b7e75ab7dba93eeef56cfd Mon Sep 17 00:00:00 2001 From: Vermaas <vermaas@astron.nl> Date: Tue, 23 Jul 2024 14:31:18 +0200 Subject: [PATCH] add COLLECT_H5 logic (including a database change) --- atdb/taskdatabase/services/activities_handler.py | 4 ++-- atdb/taskdatabase/services/common.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py index 790f3e53..71eb44f5 100644 --- a/atdb/taskdatabase/services/activities_handler.py +++ b/atdb/taskdatabase/services/activities_handler.py @@ -186,7 +186,7 @@ def update_processed_and_aggregate(task): if (task.workflow.aggregation_strategy == AggregationStrategy.COLLECT_H5.value): # check if the activity is ready to collect H5 data - if (not activity.is_aggregated and activity.status != 'aggregate'): + if (not activity.is_aggregated and activity.status != State.COLLECTING_DATA.value): # check if there is already a storage_location, if not, add it. if activity.storage_location == "unknown": @@ -194,7 +194,7 @@ def update_processed_and_aggregate(task): # this means that its tasks know that they should copy their H5 files to the storage_location # (but the tasks cannot do that, the aggregator service does) - activity.status = State.COLLECT_DATA.value + activity.status = State.COLLECTING_DATA.value activity.save() diff --git a/atdb/taskdatabase/services/common.py b/atdb/taskdatabase/services/common.py index c4da4748..0de7f323 100644 --- a/atdb/taskdatabase/services/common.py +++ b/atdb/taskdatabase/services/common.py @@ -28,7 +28,7 @@ class State(Enum): SUSPENDED = "suspended" DISCARDED = "discarded" FAILED = "failed" - COLLECT_DATA = "collect_data" + COLLECTING_DATA = "collecting_data" VERIFIED_STATUSSES = [State.STORED.value, State.VALIDATED.value, State.SCRUBBED.value, State.PRE_ARCHIVED.value, State.ARCHIVED.value, State.FINISHED.value, State.SUSPENDED.value, State.DISCARDED.value] -- GitLab