@@ -4,9 +4,8 @@ BASE_DIR=/data/tier0
44DEPLOY_DIR=$BASE_DIR /srv/wmagent
55SPEC_DIR=$BASE_DIR /admin/Specs
66
7- TIER0_VERSION=2.2.3
7+ TIER0_VERSION=2.2.4
88TIER0_ARCH=slc7_amd64_gcc630
9- DEPLOY_TAG=HG2104a
109
1110function echo_header {
1211 echo ' '
@@ -24,18 +23,34 @@ mkdir -p $SPEC_DIR
2423cd $BASE_DIR
2524echo_header " deleting deployment dir \" deployment\" "
2625rm -rf deployment
27- git clone https://github.com/dmwm/deployment.git --branch $DEPLOY_TAG
26+ git clone https://github.com/dmwm/deployment.git
2827cd deployment
2928
29+ # Patch to test deployment adjustments
30+ # curl https://patch-diff.githubusercontent.com/raw/dmwm/deployment/pull/893.patch| patch -d ./ -p1
31+
3032echo_header ' Deploying Tier0 WMAgent'
3133# Dirk's private repo deployment
3234# ./Deploy -s prep -r comp=comp.hufnagel -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
3335# ./Deploy -s sw -r comp=comp.hufnagel -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
3436# ./Deploy -s post -r comp=comp.hufnagel -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
3537
38+ # German deployment
39+ # ./Deploy -s prep -r comp=comp.ggiraldo -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
40+ # ./Deploy -s sw -r comp=comp.ggiraldo -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
41+ # ./Deploy -s post -r comp=comp.ggiraldo -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
42+
43+ # JamadoVa deployment
44+ # ./Deploy -s prep -r comp=comp.jamadova -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
45+ # ./Deploy -s sw -r comp=comp.jamadova -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
46+ # ./Deploy -s post -r comp=comp.jamadova -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
47+
3648# Usual deployment
49+ # echo '---- Pre-deployment:'
3750./Deploy -s prep -r comp=comp -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
51+ # echo '---- Deployment:'
3852./Deploy -s sw -r comp=comp -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
53+ # echo '---- Post-deployment:'
3954./Deploy -s post -r comp=comp -A $TIER0_ARCH -t $TIER0_VERSION -R tier0@$TIER0_VERSION $DEPLOY_DIR tier0@$TIER0_VERSION
4055
4156# # global patch override
@@ -55,7 +70,8 @@ echo_header 'Initializing services / agent'
5570./config/tier0/manage start-services
5671./config/tier0/manage init-tier0
5772sleep 5
58-
73+ echo ' -------------------------------------'
74+ echo $TIER0_CONFIG_FILE
5975#
6076# mandatory configuration tweaks
6177#
@@ -110,11 +126,10 @@ echo "config.RetryManager.PauseAlgo.default.coolOffTime = {'create': 10, 'job':
110126# echo 'config.DBS3Upload.pollInterval = 30' >> ./config/tier0/config.py
111127# echo 'config.PhEDExInjector.pollInterval = 30' >> ./config/tier0/config.py
112128
113- #
114- # configure Tier0-Mode for PhEDEx
115- #
116129# Twiking Rucio configuration
117- sed -i " s+config.RucioInjector.containerDiskRuleParams.*+config.RucioInjector.containerDiskRuleParams = {'lifetime': 15 * 24 * 60 * 60}+" ./config/tier0/config.py
130+ sed -i " s+config.RucioInjector.listTiersToInject.*+config.RucioInjector.listTiersToInject = ['AOD', 'MINIAOD', 'NANOAOD', 'NANOAODSIM', 'RAW', 'FEVT', 'USER', 'ALCARECO', 'ALCAPROMPT', 'DQMIO','RAW-RECO']+" ./config/tier0/config.py
131+ sed -i " s+config.RucioInjector.containerDiskRuleParams.*+config.RucioInjector.containerDiskRuleParams = {'lifetime': 7 * 24 * 60 * 60}+" ./config/tier0/config.py
132+
118133
119134#
120135# Set output datasets status to VALID in DBS
@@ -207,7 +222,13 @@ echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> ./config/tier0/con
207222# Setting up sites
208223#
209224
210- ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --cms-name=T2_CH_CERN --pnn=T2_CH_CERN --ce-name=T2_CH_CERN --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
225+ # Setting for T0_CH_CERN_Disk
226+ ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --cms-name=T2_CH_CERN --pnn=T0_CH_CERN_Disk --ce-name=T2_CH_CERN --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
227+ ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T0_CH_CERN_Disk --cms-name=T0_CH_CERN_Disk --pnn=T2_CH_CERN --ce-name=T0_CH_CERN_Disk --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
228+
229+ # Setting for T2_CH_CERN
230+ # ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --cms-name=T2_CH_CERN --pnn=T2_CH_CERN --ce-name=T2_CH_CERN --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
231+
211232./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Processing --pending-slots=10000 --running-slots=10000
212233./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Merge --pending-slots=1000 --running-slots=1000
213234./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Cleanup --pending-slots=1000 --running-slots=1000
0 commit comments