From 3a6beb27de08b58699e12771856cdf93d6ddeba0 Mon Sep 17 00:00:00 2001 From: Kenyi Hurtado Date: Tue, 3 Sep 2024 12:35:55 -0400 Subject: [PATCH 1/2] Disable relval workflows going to disk by default in MSOutput. --- src/python/WMCore/MicroService/MSOutput/MSOutput.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/python/WMCore/MicroService/MSOutput/MSOutput.py b/src/python/WMCore/MicroService/MSOutput/MSOutput.py index 64ec55158a..0cf8d256f0 100644 --- a/src/python/WMCore/MicroService/MSOutput/MSOutput.py +++ b/src/python/WMCore/MicroService/MSOutput/MSOutput.py @@ -81,7 +81,10 @@ def __init__(self, msConfig, mode, logger=None): self.mode = mode self.msConfig.setdefault("limitRequestsPerCycle", 500) self.msConfig.setdefault("enableDataPlacement", False) + # Enable relval workflows to go to tape self.msConfig.setdefault("enableRelValCustodial", False) + # Enable relval workflows to go to disk + self.msConfig.setdefault("enableRelValDisk", False) self.msConfig.setdefault("excludeDataTier", []) self.msConfig.setdefault("rucioAccount", 'wmcore_transferor') self.msConfig.setdefault("rucioRSEAttribute", 'dm_weight') @@ -737,8 +740,10 @@ def canDatasetGoToDisk(self, dataItem, isRelVal=False): :return: True if the dataset is allowed to pass, False otherwise """ # Bypass every configuration for RelVals, keep everything on disk + # unless the disk option for this workflow is not enabled. if isRelVal: - return True + return self.msConfig['enableRelValDisk'] + dataTier = dataItem['Dataset'].split('/')[-1] if dataTier in self.msConfig['excludeDataTier']: self.logger.warning("Skipping dataset: %s because it's excluded in the MS configuration", From ebfc1e992bf1e397576b3ee78c56afa8eae7e7de 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] = []