Skip to content

Commit

Permalink
Change T2_CH_CERN_HLT to T2_CH_CERN_P5 (#4790)
Browse files Browse the repository at this point in the history
* Change T2_CH_CERN_HLT to T2_CH_CERN_P5 in prod

* Change T2_CH_CERN_HLT to T2_CH_CERN_P5 in replay

* Remove T2_CH_CERN_HLT from  prod config
  • Loading branch information
germanfgv authored Feb 6, 2023
1 parent 4e37dd2 commit 8737f2c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
18 changes: 9 additions & 9 deletions bin/00_deploy_prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@ echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> ./config/tier0/con
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Express --pending-slots=3000 --running-slots=3000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Repack --pending-slots=5000 --running-slots=5000

#Settings for using T2_CH_CERN_HLT (PromptReco)
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --cms-name=T2_CH_CERN_HLT --pnn=T2_CH_CERN_HLT --ce-name=T2_CH_CERN_HLT --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Processing --pending-slots=10000 --running-slots=10000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Merge --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Cleanup --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=LogCollect --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Skim --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Production --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Harvesting --pending-slots=1000 --running-slots=1000
#Settings for using T2_CH_CERN_P5 (PromptReco)
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --cms-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --ce-name=T2_CH_CERN_P5 --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=10000 --running-slots=10000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=LogCollect --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Skim --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Production --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Harvesting --pending-slots=1000 --running-slots=1000

# Thresholds configurations
echo "config.AgentStatusWatcher.t1SitesCores = 12.5" >> ./config/tier0/config.py
Expand Down
18 changes: 9 additions & 9 deletions bin/00_deploy_replay.sh
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> ./config/tier0/con
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Express --pending-slots=3000 --running-slots=3000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Repack --pending-slots=5000 --running-slots=5000

#Settings for using T2_CH_CERN_HLT (PromptReco)
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --cms-name=T2_CH_CERN_HLT --pnn=T2_CH_CERN_HLT --ce-name=T2_CH_CERN_HLT --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Processing --pending-slots=10000 --running-slots=10000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Merge --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Cleanup --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=LogCollect --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Skim --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Production --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Harvesting --pending-slots=1000 --running-slots=1000
#Settings for using T2_CH_CERN_P5 (PromptReco)
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --cms-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --ce-name=T2_CH_CERN_P5 --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=10000 --running-slots=10000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=LogCollect --pending-slots=1000 --running-slots=1000
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Skim --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Production --pending-slots=1 --running-slots=1
./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Harvesting --pending-slots=1000 --running-slots=1000

# Thresholds configurations
echo "config.AgentStatusWatcher.t1SitesCores = 12.5" >> ./config/tier0/config.py
Expand Down
22 changes: 11 additions & 11 deletions etc/ProdOfflineConfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
archival_node="T0_CH_CERN_MSS",
tape_node="T1_US_FNAL_MSS",
disk_node="T1_US_FNAL_Disk",
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
raw_to_disk=False,
aod_to_disk=True,
blockCloseDelay=24 * 3600,
Expand Down Expand Up @@ -544,7 +544,7 @@
for dataset in DATASETS:
addDataset(tier0Config, dataset,
do_reco=True,
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
archival_node=None,
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
Expand All @@ -556,7 +556,7 @@
addDataset(tier0Config, dataset,
do_reco=True,
aod_to_disk=False,
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
archival_node=None,
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
Expand All @@ -570,7 +570,7 @@
write_dqm=True,
dqm_sequences=["@common", "@muon", "@heavyFlavor"],
alca_producers=["TkAlJpsiMuMu", "TkAlUpsilonMuMu"],
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
archival_node=None,
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
Expand All @@ -587,7 +587,7 @@
aod_to_disk=False,
dqm_sequences=["@common", "@muon", "@heavyFlavor"],
alca_producers=["TkAlJpsiMuMu", "TkAlUpsilonMuMu"],
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
archival_node=None,
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
Expand Down Expand Up @@ -1059,7 +1059,7 @@
write_dqm=False,
write_aod=False,
archival_node=None,
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
scenario=ppScenario)
Expand Down Expand Up @@ -1169,7 +1169,7 @@
dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@L1TMon", "@hcal", "@muon", "@jetmet", "@ctpps"],
alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias", "HcalCalIsolatedBunchSelector"],
physics_skims=["LogError", "LogErrorMonitor"],
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
timePerEvent=3.5,
sizePerEvent=1500,
tape_node="T1_ES_PIC_MSS",
Expand All @@ -1187,7 +1187,7 @@
dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@L1TMon", "@hcal", "@muon", "@jetmet", "@ctpps"],
alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias"],
physics_skims=["LogError", "LogErrorMonitor"],
siteWhitelist = ["T2_CH_CERN_HLT"],
siteWhitelist = ["T2_CH_CERN_P5"],
timePerEvent=3.5,
sizePerEvent=1500,
tape_node="T1_ES_PIC_MSS",
Expand All @@ -1208,7 +1208,7 @@
write_dqm=False,
write_aod=False,
archival_node=None,
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
scenario=ppScenario)
Expand All @@ -1230,7 +1230,7 @@
addDataset(tier0Config, dataset,
do_reco=True,
archival_node=None,
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
scenario=ppScenario)
Expand All @@ -1243,7 +1243,7 @@
do_reco=True,
archival_node=None,
aod_to_disk=False,
siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
tape_node="T0_CH_CERN_MSS",
disk_node="T2_CH_CERN",
scenario=ppScenario)
Expand Down

0 comments on commit 8737f2c

Please sign in to comment.