diff --git a/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py b/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py index 95b9cda7ea5..3ded1d0eb8e 100644 --- a/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py +++ b/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py @@ -1,22 +1,16 @@ -######################################################################## -# File : DownloadInputData.py -# Author : Stuart Paterson -######################################################################## - """ The Download Input Data module wraps around the Replica Management - components to provide access to datasets by available site protocols as - defined in the CS for the VO. + components to provide access to datasets by downloading locally """ import os -import tempfile import random +import tempfile -from DIRAC import S_OK, S_ERROR, gLogger -from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient -from DIRAC.Resources.Storage.StorageElement import StorageElement +from DIRAC import S_ERROR, S_OK, gLogger from DIRAC.Core.Utilities.Os import getDiskSpace from DIRAC.Core.Utilities.ReturnValues import returnSingleResult from DIRAC.DataManagementSystem.Utilities.DMSHelpers import DMSHelpers +from DIRAC.Resources.Storage.StorageElement import StorageElement +from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient COMPONENT_NAME = "DownloadInputData" @@ -37,7 +31,6 @@ class DownloadInputData: ############################################################################# def __init__(self, argumentsDict): """Standard constructor""" - self.name = COMPONENT_NAME self.inputData = argumentsDict["InputData"] self.configuration = argumentsDict["Configuration"] self.jobID = self.configuration.get("JobID") @@ -45,7 +38,7 @@ def __init__(self, argumentsDict): self.fileCatalogResult = argumentsDict["FileCatalog"] # By default put each input data file into a separate directory self.inputDataDirectory = argumentsDict.get("InputDataDirectory", "PerFile") - + self.log = gLogger.getSubLogger(f"[{self.jobID}]{self.__class__.__name__}") self.log.showHeaders(True) diff --git a/src/DIRAC/WorkloadManagementSystem/Client/InputDataByProtocol.py b/src/DIRAC/WorkloadManagementSystem/Client/InputDataByProtocol.py index 3acedc0beb1..b08eeae1bf9 100644 --- a/src/DIRAC/WorkloadManagementSystem/Client/InputDataByProtocol.py +++ b/src/DIRAC/WorkloadManagementSystem/Client/InputDataByProtocol.py @@ -1,13 +1,8 @@ -######################################################################## -# File : InputDataByProtocol.py -# Author : Stuart Paterson -######################################################################## - """ The Input Data By Protocol module wraps around the Replica Management components to provide access to datasets by available site protocols as defined in the CS for the VO. """ -from DIRAC import S_OK, S_ERROR, gLogger +from DIRAC import S_ERROR, S_OK, gLogger from DIRAC.Resources.Storage.StorageElement import StorageElement from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient @@ -18,7 +13,6 @@ class InputDataByProtocol: ############################################################################# def __init__(self, argumentsDict): """Standard constructor""" - self.name = COMPONENT_NAME self.inputData = argumentsDict["InputData"] self.configuration = argumentsDict["Configuration"] self.jobID = self.configuration.get("JobID")