Loading transfer_service/store_preprocessor.py +0 −3 Original line number Diff line number Diff line Loading @@ -34,7 +34,6 @@ class StorePreprocessor(TaskExecutor): self.params.getint("port"), self.params["db"]) self.params = config.loadSection("transfer_node") #self.storageBasePath = self.params["base_path"] self.storageStorePath = self.params["store_path"] self.jobObj = None self.username = None Loading Loading @@ -140,7 +139,6 @@ class StorePreprocessor(TaskExecutor): self.userId = self.dbConn.getRapId(self.username) out.write(f"USER: {self.username}\n") out.write(f"USER_ID: {self.userId}\n") #pathPrefix = self.storageBasePath.replace("{username}", self.username) pathPrefix = self.storageStorePath.replace("{username}", self.username) tstampWrapperDirPattern = re.compile("/[0-9]{4}_[0-9]{2}_[0-9]{2}-[0-9]{2}_[0-9]{2}_[0-9]{2}") for dir in dirs: Loading Loading @@ -206,7 +204,6 @@ class StorePreprocessor(TaskExecutor): self.username = self.jobObj.jobInfo["userName"] self.prepare(self.username) self.execute() #self.srcQueue.moveJobTo(self.destQueue.name()) self.jobObj.jobInfo["nodeList"] = self.nodeList self.srcQueue.extractJob() self.destQueue.insertJob(self.jobObj) Loading Loading
transfer_service/store_preprocessor.py +0 −3 Original line number Diff line number Diff line Loading @@ -34,7 +34,6 @@ class StorePreprocessor(TaskExecutor): self.params.getint("port"), self.params["db"]) self.params = config.loadSection("transfer_node") #self.storageBasePath = self.params["base_path"] self.storageStorePath = self.params["store_path"] self.jobObj = None self.username = None Loading Loading @@ -140,7 +139,6 @@ class StorePreprocessor(TaskExecutor): self.userId = self.dbConn.getRapId(self.username) out.write(f"USER: {self.username}\n") out.write(f"USER_ID: {self.userId}\n") #pathPrefix = self.storageBasePath.replace("{username}", self.username) pathPrefix = self.storageStorePath.replace("{username}", self.username) tstampWrapperDirPattern = re.compile("/[0-9]{4}_[0-9]{2}_[0-9]{2}-[0-9]{2}_[0-9]{2}_[0-9]{2}") for dir in dirs: Loading Loading @@ -206,7 +204,6 @@ class StorePreprocessor(TaskExecutor): self.username = self.jobObj.jobInfo["userName"] self.prepare(self.username) self.execute() #self.srcQueue.moveJobTo(self.destQueue.name()) self.jobObj.jobInfo["nodeList"] = self.nodeList self.srcQueue.extractJob() self.destQueue.insertJob(self.jobObj) Loading