@@ -175,28 +175,41 @@ def process_new_931_file_task(
175175 config = config
176176 )
177177
178- logger .info (f"Step 1: Copying { file_path } from data931 ({ config .bl931_compute_dtn .name } ) "
178+ # logger.info(f"Step 1: Copying {file_path} from data931 to beegfs ({config.bl931_beegfs.name})")
179+
180+ # beegfs_transfer_success = transfer_controller.copy(
181+ # file_path=file_path,
182+ # source=config.bl931_compute_dtn,
183+ # destination=config.bl931_beegfs
184+ # )
185+ # if not beegfs_transfer_success:
186+ # logger.error("Step 1 failed: Beegfs transfer was not successful")
187+ # raise Warning("Beegfs transfer failed")
188+ # else:
189+ # logger.info("Step 1 complete: File copied to beegfs")
190+
191+ logger .info (f"Step 2: Copying { file_path } from data931 ({ config .bl931_compute_dtn .name } ) "
179192 f"to NERSC CFS ({ config .bl931_nersc_alsdev_raw .name } )" )
180193
181194 try :
182- transfer_success = transfer_controller .copy (
195+ nersc_transfer_success = transfer_controller .copy (
183196 file_path = file_path ,
184197 source = config .bl931_compute_dtn ,
185198 destination = config .bl931_nersc_alsdev_raw
186199 )
187- if not transfer_success :
188- logger .error ("Step 1 failed: Transfer was not successful" )
200+ if not nersc_transfer_success :
201+ logger .error ("Step 2 failed: NERSC transfer was not successful" )
189202 raise RuntimeError ("Transfer failed" )
190203
191- logger .info ("Step 1 complete: File copied to NERSC CFS" )
204+ logger .info ("Step 2 complete: File copied to NERSC CFS" )
192205 except Exception as e :
193- logger .error (f"Step 1 failed: Could not copy file to NERSC CFS: { e } " , exc_info = True )
206+ logger .error (f"Step 2 failed: Could not copy file to NERSC CFS: { e } " , exc_info = True )
194207 raise
195208
196209 # Waiting for PR #62 to be merged (prune_controller)
197210 # TODO: Determine scheduling days_from_now based on beamline needs
198211
199- logger .info ("Step 2 : Scheduling pruning from data931" )
212+ logger .info ("Step 3 : Scheduling pruning from data931" )
200213 try :
201214 bl931_settings = Variable .get ("bl931-settings" , _sync = True )
202215 days_from_now = bl931_settings .get ("delete_data931_files_after_days" , 180 )
@@ -208,9 +221,9 @@ def process_new_931_file_task(
208221 check_endpoint = config .bl931_nersc_alsdev_raw ,
209222 days_from_now = days_from_now
210223 )
211- logger .info ("Step 2 complete: Pruning scheduled" )
224+ logger .info ("Step 3 complete: Pruning scheduled" )
212225 except Exception as e :
213- logger .error (f"Step 2 failed: Could not schedule pruning: { e } " , exc_info = True )
226+ logger .error (f"Step 3 failed: Could not schedule pruning: { e } " , exc_info = True )
214227 raise
215228
216229 logger .info (f"All steps complete for file: { file_path } " )
0 commit comments