From 5818a3ac9f83eae1cfdf41b40442f3c5bd44f4ac Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:32:49 -0500 Subject: [PATCH 1/8] Update 00_pypi_tweak_prod_config.sh --- bin/00_pypi_tweak_prod_config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/00_pypi_tweak_prod_config.sh b/bin/00_pypi_tweak_prod_config.sh index 045b7c830..403655f1a 100644 --- a/bin/00_pypi_tweak_prod_config.sh +++ b/bin/00_pypi_tweak_prod_config.sh @@ -8,7 +8,6 @@ sed -i "s+'team1,team2,cmsdataops'+'tier0production'+g" "$config/config.py" sed -i "s+config.RucioInjector.containerDiskRuleParams.*+config.RucioInjector.containerDiskRuleParams = {}+" "$config/config.py" echo "config.RucioInjector.blockRuleParams = {}" >> $config/config.py sed -i "s+config.RucioInjector.metaDIDProject.*+config.RucioInjector.metaDIDProject = 'Tier0'+" "$config/config.py" -echo "config.RucioInjector.blockDeletionDelayHours = 168" >> $config/config.py ##### NOT IN REPLAY ##### echo "config.RucioInjector.blockDeletionDelayHours = 168" >> $config/config.py echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> $config/config.py @@ -37,4 +36,4 @@ if [ "x$DROPBOX_USER" == "x" ] || [ "x$DROPBOX_PASS" == "x" ]; then fi echo 'config.Tier0Feeder.dropboxuser = "'$DROPBOX_USER'"' >> $config/config.py -echo 'config.Tier0Feeder.dropboxpass = "'$DROPBOX_PASS'"' >> $config/config.py \ No newline at end of file +echo 'config.Tier0Feeder.dropboxpass = "'$DROPBOX_PASS'"' >> $config/config.py From 4f00805c0ebeb3a22a0d935b3b4b0cfa5c12d630 Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Wed, 2 Oct 2024 01:01:14 -0500 Subject: [PATCH 2/8] Update __init__.py --- src/python/T0/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/T0/__init__.py b/src/python/T0/__init__.py index dca33f28f..444a1d30b 100644 --- a/src/python/T0/__init__.py +++ b/src/python/T0/__init__.py @@ -4,5 +4,5 @@ Core libraries for Workload Management Packages """ -__version__ = '3.2.4.pre2' +__version__ = '3.2.5' __all__ = [] From 0df9a9d9d29b626d85f552e24b0b34dd4db0a3b1 Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Wed, 2 Oct 2024 01:02:51 -0500 Subject: [PATCH 3/8] Update 00_pypi_deploy_prod.sh --- bin/00_pypi_deploy_prod.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/00_pypi_deploy_prod.sh b/bin/00_pypi_deploy_prod.sh index 63b3225ea..a4d67441e 100755 --- a/bin/00_pypi_deploy_prod.sh +++ b/bin/00_pypi_deploy_prod.sh @@ -30,8 +30,8 @@ then exit fi -WMAGENT_TAG=2.3.4 -TIER0_VERSION=3.2.3 +WMAGENT_TAG=2.3.5 +TIER0_VERSION=3.2.5 COUCH_TAG=3.2.2 BASE_DIR=/data/tier0 From 086901502c9b82269798757e6ef61fe30e62b14d Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Wed, 2 Oct 2024 01:03:15 -0500 Subject: [PATCH 4/8] Update 00_pypi_deploy_replay.sh --- bin/00_pypi_deploy_replay.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/00_pypi_deploy_replay.sh b/bin/00_pypi_deploy_replay.sh index 3384d3f64..d0d00254e 100644 --- a/bin/00_pypi_deploy_replay.sh +++ b/bin/00_pypi_deploy_replay.sh @@ -15,8 +15,8 @@ then exit fi -WMAGENT_TAG=2.3.4rc11 -TIER0_VERSION=3.2.4rc1 +WMAGENT_TAG=2.3.5 +TIER0_VERSION=3.2.5 COUCH_TAG=3.2.2 BASE_DIR=/data/tier0 From 178a4c4a4a8288b6d44fc222ea4b4e83556f6680 Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Wed, 9 Oct 2024 04:19:52 -0500 Subject: [PATCH 5/8] Acquisition era change to Run2024I (#4998) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * hlt scouting scenario for NANOAOD production ScoutingPFRun3 PD * Era change to Run2024I --------- Co-authored-by: Antonio Linares Co-authored-by: Germán Felipe Giraldo Villa --- etc/ProdOfflineConfiguration.py | 9 ++++++--- etc/ReplayOfflineConfiguration.py | 7 +++++-- src/python/T0/WMBS/Oracle/Create.py | 3 ++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py index 279b2ea5e..8ee606616 100644 --- a/etc/ProdOfflineConfiguration.py +++ b/etc/ProdOfflineConfiguration.py @@ -65,7 +65,7 @@ # Data type # Processing site (where jobs run) # PhEDEx locations -setAcquisitionEra(tier0Config, "Run2024H") +setAcquisitionEra(tier0Config, "Run2024I") setEmulationAcquisitionEra(tier0Config, "Emulation2024") setBaseRequestPriority(tier0Config, 251000) setBackfill(tier0Config, None) @@ -128,6 +128,7 @@ alcaPPSScenario = "AlCaPPS_Run3" hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" +hltScoutingScenario = "hltScoutingEra_Run3_2024" # Defaults for processing version alcarawProcVersion = { @@ -1319,10 +1320,12 @@ DATASETS = ["ScoutingPFRun3"] for dataset in DATASETS: addDataset(tier0Config, dataset, - do_reco=False, + do_reco=True, + write_aod=False, + write_miniaod=False, tape_node="T1_US_FNAL_MSS", disk_node="T1_US_FNAL_Disk", - scenario=ppScenario) + scenario=hltScoutingScenario) DATASETS = ["ParkingDoubleElectronLowMass","ParkingDoubleElectronLowMass0"] for dataset in DATASETS: diff --git a/etc/ReplayOfflineConfiguration.py b/etc/ReplayOfflineConfiguration.py index 3acee377f..c73356e6c 100644 --- a/etc/ReplayOfflineConfiguration.py +++ b/etc/ReplayOfflineConfiguration.py @@ -136,6 +136,7 @@ alcaPPSScenario = "AlCaPPS_Run3" hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" +hltScoutingScenario = "hltScoutingEra_Run3_2024" # Procesing version number replays # Taking Replay processing ID from the last 8 digits of the DeploymentID @@ -1213,8 +1214,10 @@ DATASETS = ["ScoutingPFRun3"] for dataset in DATASETS: addDataset(tier0Config, dataset, - do_reco=False, - scenario=ppScenario) + do_reco=True, + write_aod=False, + write_miniaod=False, + scenario=hltScoutingScenario) DATASETS = ["ParkingDoubleElectronLowMass0","ParkingDoubleElectronLowMass1","ParkingDoubleElectronLowMass2", "ParkingDoubleElectronLowMass3","ParkingDoubleElectronLowMass4","ParkingDoubleElectronLowMass5", diff --git a/src/python/T0/WMBS/Oracle/Create.py b/src/python/T0/WMBS/Oracle/Create.py index c87dd063e..6bb63bc36 100644 --- a/src/python/T0/WMBS/Oracle/Create.py +++ b/src/python/T0/WMBS/Oracle/Create.py @@ -941,7 +941,8 @@ def __init__(self, logger = None, dbi = None, params = None): 48 : "ppEra_Run3_2023", 49 : "ppEra_Run3_pp_on_PbPb_2023", 50 : "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023", - 51 : "ppEra_Run3_2023_repacked" + 51 : "ppEra_Run3_2023_repacked", + 52 : "hltScoutingEra_Run3_2024" } for id, name in list(eventScenarios.items()): sql = """INSERT INTO event_scenario From 513ec2ebda620a39815e3e99b85554f3b3c4eb65 Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:13:57 -0500 Subject: [PATCH 6/8] Update ProdOfflineConfiguration.py Defining helper agents only once --- etc/ProdOfflineConfiguration.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py index 8ee606616..4a57f35b9 100644 --- a/etc/ProdOfflineConfiguration.py +++ b/etc/ProdOfflineConfiguration.py @@ -42,10 +42,6 @@ # Set the max run number: setInjectMaxRun(tier0Config, 9999999) -# Set streams to ignore by agent. These will not be injected by the MainAgent -setHelperAgentStreams(tier0Config, {"SecondAgent" : [], - "ThirdAgent" : []}) - # Settings up sites processingSite = "T2_CH_CERN" @@ -1465,7 +1461,7 @@ ignoreStream(tier0Config, "streamDQMRates") ignoreStream(tier0Config, "DQMPPSRandom") -# Set streams to ignore by agent. These will not be injected +# Set streams to ignore by MainAgent. These will not be injected setHelperAgentStreams(tier0Config, {"SecondAgent" : DATASETS_DAQ_TFTEST}) ################################### From bee5c8dfe68772bc114ecb2cf04c8665a3c8b954 Mon Sep 17 00:00:00 2001 From: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:55:00 -0500 Subject: [PATCH 7/8] Update production configuration and replay to CMSSW_14_0_18, move processing version to 2 (#5003) Co-authored-by: Fabio Cossutti --- etc/ProdOfflineConfiguration.py | 8 ++++---- etc/ReplayOfflineConfiguration.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py index 4a57f35b9..c9d799518 100644 --- a/etc/ProdOfflineConfiguration.py +++ b/etc/ProdOfflineConfiguration.py @@ -102,7 +102,7 @@ # maxRunPreviousConfig = 999999 # Last run before era change 08/09/23 # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_14_0_16", + 'default': "CMSSW_14_0_18", #'acqEra': {'Run2024F': "CMSSW_14_0_11"}, #'maxRun': {maxRunPreviousConfig: "CMSSW_13_2_2"} } @@ -128,15 +128,15 @@ # Defaults for processing version alcarawProcVersion = { - 'default': 1 + 'default': 2 } defaultProcVersionReco = { - 'default': 1 + 'default': 2 } expressProcVersion = { - 'default': 1 + 'default': 2 } # Defaults for GlobalTag diff --git a/etc/ReplayOfflineConfiguration.py b/etc/ReplayOfflineConfiguration.py index c73356e6c..fffe227b7 100644 --- a/etc/ReplayOfflineConfiguration.py +++ b/etc/ReplayOfflineConfiguration.py @@ -37,10 +37,10 @@ setConfigVersion(tier0Config, "replace with real version") # Set run number to replay -# 382726 Cosmics, 4 hours # 382686 - Collisions, 43.3 pb-1, 23.9583 TB NEW +# 386674 Cosmics ~40 minutes in Run2024I with occupancy issues -setInjectRuns(tier0Config, [382686, 382726]) +setInjectRuns(tier0Config, [382686, 386674]) # Use this in order to limit the number of lumisections to process #setInjectLimit(tier0Config, 10) @@ -116,7 +116,7 @@ # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_14_0_16" + 'default': "CMSSW_14_0_18" } # Configure ScramArch From ad17a5b3fcb4e557e748e5ab6dffe2f1addc0c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Felipe=20Giraldo=20Villa?= Date: Thu, 10 Oct 2024 18:59:03 +0200 Subject: [PATCH 8/8] Add parking to secondary agent (#5001) Co-authored-by: Antonio Linares Sancho <132582167+LinaresToine@users.noreply.github.com> --- etc/ProdOfflineConfiguration.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py index c9d799518..b1bd92842 100644 --- a/etc/ProdOfflineConfiguration.py +++ b/etc/ProdOfflineConfiguration.py @@ -42,7 +42,6 @@ # Set the max run number: setInjectMaxRun(tier0Config, 9999999) - # Settings up sites processingSite = "T2_CH_CERN" storageSite = "T0_CH_CERN_Disk" @@ -561,7 +560,7 @@ scenario=ppScenario) DATASETS = ["ParkingSingleMuon","ParkingSingleMuon0"] - +PARKING_PDS = DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -574,7 +573,7 @@ "ParkingSingleMuon4","ParkingSingleMuon5","ParkingSingleMuon6", "ParkingSingleMuon7","ParkingSingleMuon8","ParkingSingleMuon9", "ParkingSingleMuon10","ParkingSingleMuon11"] - +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -585,7 +584,7 @@ scenario=ppScenario) DATASETS = ["ParkingDoubleMuonLowMass0"] - +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -600,7 +599,7 @@ DATASETS = ["ParkingDoubleMuonLowMass1","ParkingDoubleMuonLowMass2", "ParkingDoubleMuonLowMass3","ParkingDoubleMuonLowMass4","ParkingDoubleMuonLowMass5", "ParkingDoubleMuonLowMass6","ParkingDoubleMuonLowMass7"] - +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -641,7 +640,7 @@ "ParkingVBF1", "ParkingVBF2", "ParkingVBF3", "ParkingVBF4", "ParkingVBF5", "ParkingVBF6", "ParkingVBF7"] - +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -654,7 +653,7 @@ scenario=ppScenario) DATASETS = ["ParkingLLP"] - +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -1324,6 +1323,7 @@ scenario=hltScoutingScenario) DATASETS = ["ParkingDoubleElectronLowMass","ParkingDoubleElectronLowMass0"] +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -1336,7 +1336,7 @@ DATASETS = ["ParkingDoubleElectronLowMass1","ParkingDoubleElectronLowMass2", "ParkingDoubleElectronLowMass3","ParkingDoubleElectronLowMass4","ParkingDoubleElectronLowMass5"] - +PARKING_PDS += DATASETS for dataset in DATASETS: addDataset(tier0Config, dataset, do_reco=True, @@ -1461,8 +1461,11 @@ ignoreStream(tier0Config, "streamDQMRates") ignoreStream(tier0Config, "DQMPPSRandom") -# Set streams to ignore by MainAgent. These will not be injected -setHelperAgentStreams(tier0Config, {"SecondAgent" : DATASETS_DAQ_TFTEST}) + +# Set streams to ignore by agent. These will not be injected +SECOND_AGENT_PDS = PARKING_PDS + DATASETS_DAQ_TFTEST +setHelperAgentStreams(tier0Config, {"SecondAgent" : SECOND_AGENT_PDS}) + ################################### ### currently inactive settings ###