From d965cf6e8cf968ae398d3b5d5ba372cab24d475b Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Tue, 26 Mar 2024 15:32:42 -0400 Subject: [PATCH 1/3] Updating workflow json templates --- .../requests/Integration/ReReco_MINIAOD.json | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 test/data/ReqMgr/requests/Integration/ReReco_MINIAOD.json diff --git a/test/data/ReqMgr/requests/Integration/ReReco_MINIAOD.json b/test/data/ReqMgr/requests/Integration/ReReco_MINIAOD.json new file mode 100644 index 0000000000..9e5c35b39c --- /dev/null +++ b/test/data/ReqMgr/requests/Integration/ReReco_MINIAOD.json @@ -0,0 +1,59 @@ +{ + "assignRequest": { + "AcquisitionEra": "AcquisitionEra-OVERRIDE-ME", + "Dashboard": "Dashboard-OVERRIDE-ME", + "GracePeriod": 300, + "MergedLFNBase": "/store/backfill/1", + "Override": { + "eos-lfn-prefix": "root://eoscms.cern.ch//eos/cms/store/logs/prod/recent/TESTBED" + }, + "ProcessingString": "ProcessingString-OVERRIDE-ME", + "ProcessingVersion": 19, + "SiteBlacklist": [], + "SiteWhitelist": [ + "SiteWhitelist-OVERRIDE-ME" + ], + "SoftTimeout": 129600, + "Team": "Team-OVERRIDE-ME", + "UnmergedLFNBase": "/store/unmerged" + }, + "createRequest": { + "AcquisitionEra": "Run2023C", + "BlockWhitelist": ["/MinimumBias/Run2023C-22Sep2023_v4-v1/MINIAOD#146eb70b-12ad-47dd-a109-b7feef4927cf", + "/MinimumBias/Run2023C-22Sep2023_v4-v1/MINIAOD#5b047ae4-f01e-44b4-b960-ae443ed46c2e", + "/MinimumBias/Run2023C-22Sep2023_v4-v1/MINIAOD#7597e092-5056-4316-b7b6-0b5aa48d6829"], + "CMSSWVersion": "CMSSW_13_2_6_patch2", + "Campaign": "Campaign-OVERRIDE-ME", + "Comments": { + "CheckList": "", + "WorkFlowDesc": "Based on pdmvserv_Run2023C_MinimumBias_JMENano12p5_v4_240109_045406_8426 ; ReReco with 3 MINIAOD input blocks whitelisted" + }, + "ConfigCacheID": "544d8059f5f200f8959e2e4fab11a94e", + "ConfigCacheUrl": "https://cmsweb.cern.ch/couchdb", + "CouchDBName": "reqmgr_config_cache", + "DQMUploadUrl": "https://cmsweb.cern.ch/dqm/dev", + "DbsUrl": "https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader/", + "EnableHarvesting": false, + "EventStreams": 0, + "GPUParams": "null", + "GlobalTag": "130X_dataRun3_Prompt_v4", + "IncludeParents": false, + "InputDataset": "/MinimumBias/Run2023C-22Sep2023_v4-v1/MINIAOD", + "Memory": 4000, + "Multicore": 2, + "PrepID": "TEST-ReReco-Run2023C-MinimumBias-JMENano12p5_v4-00001", + "ProcessingString": "JMENano12p5_v4", + "ProcessingVersion": 1, + "RequestPriority": 313000, + "RequestString": "RequestString-OVERRIDE-ME", + "RequestType": "ReReco", + "RequiresGPU": "forbidden", + "Scenario": "pp", + "ScramArch": [ + "el8_amd64_gcc11" + ], + "SizePerEvent": 100, + "SplittingAlgo": "EventAwareLumiBased", + "TimePerEvent": 0.5 + } +} From db4a75472f60ba2dd52582a25ac481614395e3a7 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Thu, 27 Jun 2024 14:36:28 -0400 Subject: [PATCH 2/3] StepChain template from scratch + PREMIX, 5 steps Set AAA for secondary --- .../requests/Integration/SC_PU_5Steps.json | 165 ++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 test/data/ReqMgr/requests/Integration/SC_PU_5Steps.json diff --git a/test/data/ReqMgr/requests/Integration/SC_PU_5Steps.json b/test/data/ReqMgr/requests/Integration/SC_PU_5Steps.json new file mode 100644 index 0000000000..251aa8b477 --- /dev/null +++ b/test/data/ReqMgr/requests/Integration/SC_PU_5Steps.json @@ -0,0 +1,165 @@ +{ + "assignRequest": { + "AcquisitionEra": { + "EXO_Run3Summer22EEDRPremix_01310_0": "AcquisitionEra-OVERRIDE-ME", + "EXO_Run3Summer22EEDRPremix_01310_1": "AcquisitionEra-OVERRIDE-ME", + "EXO_Run3Summer22EEMiniAODv4_01191_0": "AcquisitionEra-OVERRIDE-ME", + "EXO_Run3Summer22EENanoAODv12_01191_0": "AcquisitionEra-OVERRIDE-ME", + "EXO_Run3Summer22EEwmLHEGS_01479_0": "AcquisitionEra-OVERRIDE-ME" + }, + "Dashboard": "Dashboard-OVERRIDE-ME", + "GracePeriod": 300, + "MergedLFNBase": "/store/backfill/1", + "Override": { + "eos-lfn-prefix": "root://eoscms.cern.ch//eos/cms/store/logs/prod/recent/TESTBED" + }, + "ProcessingString": { + "EXO_Run3Summer22EEDRPremix_01310_0": "ProcessingString-OVERRIDE-ME", + "EXO_Run3Summer22EEDRPremix_01310_1": "ProcessingString-OVERRIDE-ME", + "EXO_Run3Summer22EEMiniAODv4_01191_0": "ProcessingString-OVERRIDE-ME", + "EXO_Run3Summer22EENanoAODv12_01191_0": "ProcessingString-OVERRIDE-ME", + "EXO_Run3Summer22EEwmLHEGS_01479_0": "ProcessingString-OVERRIDE-ME" + }, + "ProcessingVersion": 19, + "SiteBlacklist": [], + "SiteWhitelist": [ + "SiteWhitelist-OVERRIDE-ME" + ], + "SoftTimeout": 129600, + "Team": "Team-OVERRIDE-ME", + "TrustPUSitelists": true, + "UnmergedLFNBase": "/store/unmerged" + }, + "createRequest": { + "AcquisitionEra": "DEFAULT_AcqEra", + "CMSSWVersion": "CMSSW_13_0_13", + "Campaign": "Campaign-OVERRIDE-ME", + "Comments": { + "CheckList": "From cmsunified_task_EXO-Run3Summer22EEwmLHEGS-01479__v1_T_240206_120800_9709; Secondary AAA enabled", + "WorkFlowDesc": "SC with 5 steps from scratch; Reading PREMIX PU; KeepOutput of steps 3/4/5; Multiple campaign, prepid and CMSSW; 8 cores 16GB" + }, + "ConfigCacheUrl": "https://cmsweb.cern.ch/couchdb", + "CouchDBName": "reqmgr_config_cache", + "DQMUploadUrl": "https://cmsweb.cern.ch/dqm/dev", + "DbsUrl": "https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader/", + "DeterministicPileup": false, + "EnableHarvesting": false, + "EventStreams": 0, + "GPUParams": "null", + "GlobalTag": "130X_mcRun3_2022_realistic_postEE_v6", + "IncludeParents": false, + "Memory": 16000, + "Multicore": 8, + "PrepID": "TEST-task_EXO-Run3Summer22EEwmLHEGS-01479", + "ProcessingString": "DEFAULT_ProcStr", + "ProcessingVersion": 2, + "RequestPriority": 190017, + "RequestString": "RequestString-OVERRIDE-ME", + "RequestType": "StepChain", + "ScramArch": [ + "el8_amd64_gcc11" + ], + "SizePerEvent": 2556.8795242428296, + "Step1": { + "AcquisitionEra": "Run3Summer22EEwmLHEGS", + "CMSSWVersion": "CMSSW_12_4_19", + "Campaign": "Run3Summer22EEwmLHEGS", + "ConfigCacheID": "99f7b36120327e13f1d36e86f6891c0e", + "FilterEfficiency": 0.38005390835579517, + "GlobalTag": "124X_mcRun3_2022_realistic_postEE_v1", + "KeepOutput": false, + "LheInputFiles": false, + "PrepID": "EXO-Run3Summer22EEwmLHEGS-01479", + "PrimaryDataset": "RPVStopStopToJets_UDD323_M-2000_TuneCP5_13p6TeV-madgraphMLM-pythia8", + "ProcessingString": "Step1_WMCore_TEST", + "RequestNumEvents": 1500000, + "ScramArch": [ + "el8_amd64_gcc10" + ], + "Seeding": "AutomaticSeeding", + "SplittingAlgo": "EventBased", + "StepName": "EXO_Run3Summer22EEwmLHEGS_01479_0" + }, + "Step2": { + "AcquisitionEra": "Run3Summer22EEDRPremix", + "CMSSWVersion": "CMSSW_12_4_16", + "Campaign": "Run3Summer22EEDRPremix", + "ConfigCacheID": "db3b77054b46fa573d592e93f9d182f8", + "FilterEfficiency": 1, + "GlobalTag": "124X_mcRun3_2022_realistic_postEE_v1", + "InputFromOutputModule": "RAWSIMoutput", + "InputStep": "EXO_Run3Summer22EEwmLHEGS_01479_0", + "KeepOutput": false, + "MCPileup": "/Neutrino_E-10_gun/Run3Summer21PrePremix-Summer22_124X_mcRun3_2022_realistic_v11-v2/PREMIX", + "PrepID": "EXO-Run3Summer22EEDRPremix-01310", + "PrimaryDataset": "RPVStopStopToJets_UDD323_M-2000_TuneCP5_13p6TeV-madgraphMLM-pythia8", + "ProcessingString": "Step2_WMCore_TEST", + "ScramArch": [ + "el8_amd64_gcc10" + ], + "SplittingAlgo": "EventAwareLumiBased", + "StepName": "EXO_Run3Summer22EEDRPremix_01310_0" + }, + "Step3": { + "AcquisitionEra": "Run3Summer22EEDRPremix", + "CMSSWVersion": "CMSSW_12_4_16", + "Campaign": "Run3Summer22EEDRPremix", + "ConfigCacheID": "db3b77054b46fa573d592e93f9d183ef", + "FilterEfficiency": 1, + "GlobalTag": "124X_mcRun3_2022_realistic_postEE_v1", + "InputFromOutputModule": "PREMIXRAWoutput", + "InputStep": "EXO_Run3Summer22EEDRPremix_01310_0", + "KeepOutput": true, + "MCPileup": "/Neutrino_E-10_gun/Run3Summer21PrePremix-Summer22_124X_mcRun3_2022_realistic_v11-v2/PREMIX", + "PrepID": "EXO-Run3Summer22EEDRPremix-01310", + "PrimaryDataset": "RPVStopStopToJets_UDD323_M-2000_TuneCP5_13p6TeV-madgraphMLM-pythia8", + "ProcessingString": "Step3_WMCore_TEST", + "ScramArch": [ + "el8_amd64_gcc10" + ], + "SplittingAlgo": "EventAwareLumiBased", + "StepName": "EXO_Run3Summer22EEDRPremix_01310_1" + }, + "Step4": { + "AcquisitionEra": "Run3Summer22EEMiniAODv4", + "CMSSWVersion": "CMSSW_13_0_13", + "Campaign": "Run3Summer22EEMiniAODv4", + "ConfigCacheID": "2302da479f718297210b244fba1c8529", + "FilterEfficiency": 1, + "GlobalTag": "130X_mcRun3_2022_realistic_postEE_v6", + "InputFromOutputModule": "AODSIMoutput", + "InputStep": "EXO_Run3Summer22EEDRPremix_01310_1", + "KeepOutput": true, + "PrepID": "EXO-Run3Summer22EEMiniAODv4-01191", + "PrimaryDataset": "RPVStopStopToJets_UDD323_M-2000_TuneCP5_13p6TeV-madgraphMLM-pythia8", + "ProcessingString": "Step4_WMCore_TEST", + "ScramArch": [ + "el8_amd64_gcc11" + ], + "SplittingAlgo": "EventAwareLumiBased", + "StepName": "EXO_Run3Summer22EEMiniAODv4_01191_0" + }, + "Step5": { + "AcquisitionEra": "Run3Summer22EENanoAODv12", + "CMSSWVersion": "CMSSW_13_0_13", + "Campaign": "Run3Summer22EENanoAODv12", + "ConfigCacheID": "6f0058ffc581f8f0032aece2361c66b2", + "FilterEfficiency": 1, + "GlobalTag": "130X_mcRun3_2022_realistic_postEE_v6", + "InputFromOutputModule": "MINIAODSIMoutput", + "InputStep": "EXO_Run3Summer22EEMiniAODv4_01191_0", + "KeepOutput": true, + "PrepID": "EXO-Run3Summer22EENanoAODv12-01191", + "PrimaryDataset": "RPVStopStopToJets_UDD323_M-2000_TuneCP5_13p6TeV-madgraphMLM-pythia8", + "ProcessingString": "Step5_WMCore_TEST", + "ScramArch": [ + "el8_amd64_gcc11" + ], + "SplittingAlgo": "EventAwareLumiBased", + "StepName": "EXO_Run3Summer22EENanoAODv12_01191_0" + }, + "StepChain": 5, + "SubRequestType": "ReDigi", + "TimePerEvent": 17.548029956077905 + } +} From 250b40987ca4c62beae9910e4be0c546ae1645fb Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Thu, 27 Jun 2024 14:46:48 -0400 Subject: [PATCH 3/3] Update list of dev pileups in MSPileup --- .../data/WMCore/MicroService/DataStructs/pileups_dev.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/data/WMCore/MicroService/DataStructs/pileups_dev.json b/test/data/WMCore/MicroService/DataStructs/pileups_dev.json index 64449495c7..f279964da1 100644 --- a/test/data/WMCore/MicroService/DataStructs/pileups_dev.json +++ b/test/data/WMCore/MicroService/DataStructs/pileups_dev.json @@ -38,5 +38,13 @@ "expectedRSEs": ["T2_CH_CERN"], "campaigns": ["Apr2023_Val"], "active": true + }, + { + "pileupName": "/Neutrino_E-10_gun/Run3Summer21PrePremix-Summer22_124X_mcRun3_2022_realistic_v11-v2/PREMIX", + "customName": "", + "pileupType": "premix", + "expectedRSEs": ["T1_US_FNAL_Disk", "T2_CH_CERN"], + "campaigns": ["Apr2023_Val"], + "active": true } ]