Skip to content

Data Carousel: Fix to submit request for existing rule, set default rule lifetime, phase out Staging activity #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mightqxc merged 1 commit into from
Dec 1, 2025
Merged

Data Carousel: Fix to submit request for existing rule, set default rule lifetime, phase out Staging activity #632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions pandaserver/taskbuffer/DataCarousel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
AttributeWithType = namedtuple("AttributeWithType", ["attribute", "type"])

# DDM rule activity map for data carousel
DDM_RULE_ACTIVITY_MAP = {"anal": "Data Carousel Analysis", "prod": "Data Carousel Production", "_deprecated_": "Staging"}
DDM_RULE_ACTIVITY_MAP = {"anal": "Data Carousel Analysis", "prod": "Data Carousel Production"}

# template strings
# source replica expression prefix
Expand Down Expand Up @@ -1277,7 +1277,18 @@ def get_input_datasets_to_prestage(self, task_id: int, task_params_map: dict, ds
ret_map["related_dcreq_ids"].append(existing_dcreq_id)
# get source type and RSEs
source_type, rse_set, staging_rule, to_pin, suggested_dst_list = self._get_source_type_of_dataset(dataset, active_source_rses_set)
if source_type == "datadisk":
if staging_rule:
# reuse existing DDM rule
_, source_rse, ddm_rule_id = self._choose_tape_source_rse(dataset, rse_set, staging_rule)
tmp_log.debug(f"dataset={dataset} has existing ddm_rule_id={ddm_rule_id} ; to reuse it")
prestaging_tuple = (dataset, source_rse, ddm_rule_id, to_pin, suggested_dst_list)
tmp_log.debug(f"got prestaging for existing rule: {prestaging_tuple}")
# add to prestage
ret_prestaging_list.append(prestaging_tuple)
# dataset to pin
if to_pin:
ret_map["to_pin_ds_list"].append(dataset)
elif source_type == "datadisk":
# replicas already on datadisk; skip
ret_map["datadisk_ds_list"].append(dataset)
tmp_log.debug(f"dataset={dataset} already has replica on datadisks {rse_set} ; skipped")
Expand Down Expand Up @@ -1921,7 +1932,7 @@ def _submit_ddm_rule(self, dc_req_spec: DataCarouselRequestSpec, destination_rse
# initialize
tmp_dst_expr = None
expression = None
lifetime = None
lifetime_days = 45
weight = None
source_replica_expression = None
# source replica expression
Expand Down Expand Up @@ -1950,7 +1961,7 @@ def _submit_ddm_rule(self, dc_req_spec: DataCarouselRequestSpec, destination_rse
dataset_name=dc_req_spec.dataset,
expression=expression,
activity=ddm_rule_activity,
lifetime=lifetime,
lifetime=lifetime_days,
weight=weight,
notify="P",
source_replica_expression=source_replica_expression,
Expand Down