From 7f58bc4cc02686f7f91ba5b64060ae7b1dd6fe46 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Thu, 5 Sep 2024 16:28:36 -0400 Subject: [PATCH 1/2] Jobs that failed in JobAccountant only persist logArch1 output --- .../WMComponent/JobAccountant/AccountantWorker.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/python/WMComponent/JobAccountant/AccountantWorker.py b/src/python/WMComponent/JobAccountant/AccountantWorker.py index 943cf90ca7..820392a29c 100644 --- a/src/python/WMComponent/JobAccountant/AccountantWorker.py +++ b/src/python/WMComponent/JobAccountant/AccountantWorker.py @@ -495,19 +495,16 @@ def handleJob(self, jobID, fwkJobReport): else: fileList = fwkJobReport.getAllFilesFromStep(step='logArch1') - # Make sure every file has a valid location - # see https://github.com/dmwm/WMCore/issues/9353 - newList = [] + # Workaround: make sure every file has a valid location. See: + # https://github.com/dmwm/WMCore/issues/9353 and https://github.com/dmwm/WMCore/issues/12092 for fwjrFile in fileList: # T0 has analysis file without any location, see: # https://github.com/dmwm/WMCore/issues/9497 if not fwjrFile.get("locations") and fwjrFile.get("lfn", "").endswith(".root"): logging.warning("The following file does not have any location: %s", fwjrFile) jobSuccess = False - else: - newList.append(fwjrFile) - # save the new list free of ill files (without any location) - fileList = newList + fileList = fwkJobReport.getAllFilesFromStep(step='logArch1') + break if jobSuccess: logging.info("Job %d , handle successful job", jobID) From 6f2665b6a79d29b5701a31b45eff8c8128544db8 Mon Sep 17 00:00:00 2001 From: Kenyi Hurtado Date: Wed, 11 Sep 2024 11:37:47 -0400 Subject: [PATCH 2/2] Use PNN to PSN conversion in WQE mapping --- .../WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py b/src/python/WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py index 2b5a5aa94a..f894a44377 100644 --- a/src/python/WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py +++ b/src/python/WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py @@ -294,7 +294,7 @@ def getDatasetLocationsFromMSPileup(self, datasetsWithDbsURL): self.logger.debug(f'Retrieved MSPileup document: {doc}') if len(currentRSEs) == 0: self.logger.warning(f'No RSE has a copy of the desired pileup dataset. Expected RSEs: {doc["expectedRSEs"]}') - result[dataset] = doc['currentRSEs'] + result[dataset] = currentRSEs except IndexError: self.logger.warning('Did not find any pileup document for query: %s', queryDict['query']) result[dataset] = []