fix pandaDistributionEndpoint to support different protocols

lsst · Aug 12, 2024 · be34416 · be34416
1 parent 0fbcb7a
commit be34416
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/bps_panda_DF.yaml b/config/bps_panda_DF.yaml
@@ -8,7 +8,7 @@ project: dev
 campaign: quick
 s3EndpointUrl: "https://storage.googleapis.com"
 payloadFolder: payload
-fileDistributionEndPoint: "file://${LSST_RUN_TEMP_SPACE}/{operator}/panda_cache_box/{payloadFolder}/{uniqProcName}/"
+fileDistributionEndPoint: "${LSST_RUN_TEMP_SPACE}/panda_cache_box/{payloadFolder}/{uniqProcName}/"
 
 # location of main butler repo at USDF
 payload:

diff --git a/python/lsst/ctrl/bps/panda/panda_service.py b/python/lsst/ctrl/bps/panda/panda_service.py
@@ -95,6 +95,9 @@ def submit(self, workflow, **kwargs):
             lsst_temp = "LSST_RUN_TEMP_SPACE"
             if lsst_temp in file_distribution_uri and lsst_temp not in os.environ:
                 file_distribution_uri = self.config["fileDistributionEndPointDefault"]
+            protocol_pattern = re.compile(r"^[a-zA-Z][a-zA-Z\d+\-.]*://")
+            if not protocol_pattern.match(file_distribution_uri):
+                file_distribution_uri = "file://" + file_distribution_uri
             copy_files_for_distribution(workflow.files_to_pre_stage, file_distribution_uri, max_copy_workers)
 
             idds_client = get_idds_client(self.config)