From e44e1327a4326d8665b428122a8a8856f8c8e769 Mon Sep 17 00:00:00 2001 From: Diego da Silva Gomes Date: Mon, 14 Sep 2015 15:49:02 +0200 Subject: [PATCH] Add new cmsweb-dev machine vocms0126. --- acdcserver/ACDCConfig-dev.py | 14 +++++++++++--- acdcserver/deploy | 2 +- admin/deploy | 4 ++-- couchdb/deploy | 3 ++- crabcache/deploy | 2 +- frontend/deploy | 8 ++++++-- reqmgr/ReqMgrConfig.py | 2 ++ reqmgr/deploy | 2 +- reqmgr2/deploy | 2 +- reqmon/deploy | 7 ++++++- system/deploy | 2 +- workqueue/GlobalWorkQueueConfig-dev.py | 18 +++++++++++++----- workqueue/deploy | 2 +- workqueue/monitoring.ini | 2 +- 14 files changed, 49 insertions(+), 21 deletions(-) diff --git a/acdcserver/ACDCConfig-dev.py b/acdcserver/ACDCConfig-dev.py index 63e6543d01c..54556722d09 100644 --- a/acdcserver/ACDCConfig-dev.py +++ b/acdcserver/ACDCConfig-dev.py @@ -4,17 +4,25 @@ ACDC config for a development deployment """ +import socket from WMCore.Configuration import Configuration acdcDatabase = "acdcserver" -HOST = "cmsweb-dev.cern.ch" -COUCH = "https://%s/couchdb" % HOST + +HOST = socket.getfqdn().lower() +if re.match(r"^vocms0127\.cern\.ch$", HOST): + ALIAS = "cmsweb-dev.cern.ch" +elif re.match(r"^vocms0126\.cern\.ch$", HOST): + ALIAS = "cmsweb-dev2.cern.ch" +else: + ALIAS = HOST +COUCH = "https://%s/couchdb" % ALIAS # Nothing after this point should need to be changed. config = Configuration() config.section_("Agent") -config.Agent.hostName = HOST +config.Agent.hostName = ALIAS config.component_("ACDC") config.ACDC.couchurl = COUCH diff --git a/acdcserver/deploy b/acdcserver/deploy index a933fd0a455..d874e98e84c 100644 --- a/acdcserver/deploy +++ b/acdcserver/deploy @@ -44,7 +44,7 @@ deploy_acdcserver_post() (mkcrontab; case $variant:$host in - prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | default:* ) + prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | dev:vocms0126 | default:* ) echo "${cleanup}" ;; * ) ;; esac) | crontab - diff --git a/admin/deploy b/admin/deploy index 71b5508b525..8bf2b0d2b4a 100644 --- a/admin/deploy +++ b/admin/deploy @@ -35,7 +35,7 @@ deploy_admin_post() local pxlabel pxskip certs case $host in - vocms0127 | vocms013[1245689] | vocms0140 | vocms016[01235] | vocms030[67] | vocms0318 ) + vocms0126 | vocms0127 | vocms013[1245689] | vocms0140 | vocms016[01235] | vocms030[67] | vocms0318 ) pxlabel=cmsweb_backends ;; * ) pxlabel=devvm_$(echo $host | tr - _) ;; @@ -63,7 +63,7 @@ deploy_admin_post() crontab - case $host:$root in - vocms0127:/data/srv | vocms0134:/data/srv | vocms0135:/data/srv | \ + vocms0126:/data/srv | vocms0127:/data/srv | vocms0134:/data/srv | vocms0135:/data/srv | \ vocms0160:/data/srv | vocms0162:/data/srv | vocms0164:/data/srv ) klist -s # must have afs kerberos token LOGDIR=/afs/cern.ch/cms/cmsweb/log-archive diff --git a/couchdb/deploy b/couchdb/deploy index 1304b8b8ca5..1fd00c72b20 100644 --- a/couchdb/deploy +++ b/couchdb/deploy @@ -59,6 +59,7 @@ deploy_couchdb_post() # Daily backup the databases to other cluster machines case $host in + vocms0126 ) tohost=vocms0126 hour=1;; vocms0127 ) tohost=vocms0127 hour=1;; vocms0132 ) tohost=vocms0131 hour=1;; vocms0131 ) tohost=vocms0132 hour=2;; @@ -74,7 +75,7 @@ deploy_couchdb_post() # Weekly archive backups to castor case $host in - vocms0140 | vocms0306 | vocms0307 | vocms0318 | vocms013[123] | vocms0127 ) + vocms0140 | vocms0306 | vocms0307 | vocms0318 | vocms013[123] | vocms0127 | vocms0126) klist -s # must have afs kerberos token (acrontab -l | { fgrep -v -e " $host $project_config/" || true; } echo "#30 4 * * 0 $host $project_config/manage archive /castor/cern.ch/cms/archive/cmsweb/backups 'I did read documentation'") | acrontab diff --git a/crabcache/deploy b/crabcache/deploy index 90fdc516082..e8f9892b5b2 100644 --- a/crabcache/deploy +++ b/crabcache/deploy @@ -17,7 +17,7 @@ deploy_crabcache_sw() deploy_crabcache_post() { - case $host in vocms013[12] | vocms0127 | vocms0140 | vocms030[67] | vocms0318 ) enable ;; vocms* ) disable ;; * ) enable ;; esac + case $host in vocms013[12] | vocms012[67] | vocms0140 | vocms030[67] | vocms0318 ) enable ;; vocms* ) disable ;; * ) enable ;; esac local cmd="$project_config/manage clean 3" $nogroups || cmd="sudo -H -u _crabcache bashs -l -c '$cmd'" diff --git a/frontend/deploy b/frontend/deploy index ac89ba1e064..741f5f18435 100644 --- a/frontend/deploy +++ b/frontend/deploy @@ -44,7 +44,11 @@ deploy_frontend_post() opts="" name="-n cmsweb-testbed.cern.ch" backends=backends-preprod.txt ;; dev ) - opts="-DTEST" name="-n cmsweb-dev.cern.ch" + opts="-DTEST" + case $host in + vocms0126 ) name="-n cmsweb-dev2.cern.ch";; + * ) name="-n cmsweb-dev.cern.ch";; + esac backends=backends-dev.txt ;; * ) opts="-DTEST" name="" @@ -109,7 +113,7 @@ deploy_frontend_post() echo "23 */6 * * * $project_config/update-keys $PWD vocms0162 vocms0164" ;; preprod:vocms0134 ) echo "23 */6 * * * $project_config/update-keys $PWD vocms0135" ;; - dev:vocms0127 | default:* ) + dev:vocms0127 | dev:vocms0126 | default:* ) echo "23 */6 * * * $project_config/update-keys $PWD" ;; * ) ;; esac diff --git a/reqmgr/ReqMgrConfig.py b/reqmgr/ReqMgrConfig.py index 189625b8310..17260d94b4d 100644 --- a/reqmgr/ReqMgrConfig.py +++ b/reqmgr/ReqMgrConfig.py @@ -19,6 +19,8 @@ COUCH = "https://cmsweb-testbed.cern.ch/couchdb" elif re.match(r"^vocms0127\.cern\.ch$", HOST): COUCH = "https://cmsweb-dev.cern.ch/couchdb" +elif re.match(r"^vocms0126\.cern\.ch$", HOST): + COUCH = "https://cmsweb-dev2.cern.ch/couchdb" config = ReqMgrConfig.reqMgrConfig(installation=INSTALL, couchurl = COUCH, addMonitor = ADD_MONITOR_FLAG) diff --git a/reqmgr/deploy b/reqmgr/deploy index 0950a701dbc..f18921d0605 100644 --- a/reqmgr/deploy +++ b/reqmgr/deploy @@ -85,7 +85,7 @@ deploy_reqmgr_post() (mkcrontab sysboot case $variant:$host in - prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | default:* ) + prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | dev:vocms0126 | default:* ) local cmd="$project_config/manage updateversions 'I did read documentation'" $nogroups || cmd="sudo -H -u _reqmgr bashs -l -c \"${cmd}\"" echo "58 * * * * $cmd" ;; diff --git a/reqmgr2/deploy b/reqmgr2/deploy index 6baf69656c7..2c92ef89a63 100644 --- a/reqmgr2/deploy +++ b/reqmgr2/deploy @@ -64,7 +64,7 @@ deploy_reqmgr2_post() (mkcrontab sysboot case $variant:$host in - prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | default:* ) + prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | dev:vocms0126 | default:* ) local cmd="$project_config/manage updateversions 'I did read documentation'" $nogroups || cmd="sudo -H -u _reqmgr2 bashs -l -c \"${cmd}\"" echo "58 * * * * $cmd" ;; diff --git a/reqmon/deploy b/reqmon/deploy index 21253338d6b..a3f0cef6a5a 100644 --- a/reqmon/deploy +++ b/reqmon/deploy @@ -27,7 +27,12 @@ deploy_reqmon_sw() case $variant in prod ) base_url="https://cmsweb.cern.ch" dbs_ins="prod";; preprod ) base_url="https://cmsweb-testbed.cern.ch" dbs_ins="int";; - dev ) base_url="https://cmsweb-dev.cern.ch" dbs_ins="dev";; + dev ) case $host in + vocms0126 ) base_url="https://cmsweb-dev2.cern.ch";; + * ) base_url="https://cmsweb-dev.cern.ch";; + esac + dbs_ins="dev" + ;; * ) base_url="https://`hostname -f`" dbs_ins="private_vm";; esac perl -p -i -e "s{\"\@\@BASE_URL\@\@\"}{\"$base_url\"}g; \ diff --git a/system/deploy b/system/deploy index df5b7453bf7..9b6d09b604a 100644 --- a/system/deploy +++ b/system/deploy @@ -368,7 +368,7 @@ deploy_system_post() note "IMPORTANT: run the following to update /root/.ssh/known_hosts" note " sudo cfg/admin/ImageKey start" - note " for h in vocms0{306,307,318,12{7,8},13{1,2,4,5,6,8,9},140,16{0,1,2,3,4,5}}{,.cern.ch}; do" + note " for h in vocms0{306,307,318,12{6,7,8},13{1,2,4,5,6,8,9},140,16{0,1,2,3,4,5}}{,.cern.ch}; do" note " echo \$h; sudo cfg/admin/ImageKey run ssh cmsweb@\$h uptime" note " done" note " sudo cfg/admin/ImageKey stop" diff --git a/workqueue/GlobalWorkQueueConfig-dev.py b/workqueue/GlobalWorkQueueConfig-dev.py index 1c67fa99b08..79f4aeface2 100644 --- a/workqueue/GlobalWorkQueueConfig-dev.py +++ b/workqueue/GlobalWorkQueueConfig-dev.py @@ -15,10 +15,18 @@ workqueueInboxDbName = 'workqueue_inbox' wmstatDBName = 'wmstats' reqmgrCouchDB = "reqmgr_workload_cache" -HOST = "cmsweb-dev.cern.ch" -REQMGR = "https://%s/reqmgr/reqMgr" % HOST -REQMGR2 = "https://%s/reqmgr2" % HOST -COUCH = "https://%s/couchdb" % HOST + +HOST = socket.getfqdn().lower() +if re.match(r"^vocms0127\.cern\.ch$", HOST): + ALIAS = "cmsweb-dev.cern.ch" +elif re.match(r"^vocms0126\.cern\.ch$", HOST): + ALIAS = "cmsweb-dev2.cern.ch" +else: + ALIAS = HOST + +REQMGR = "https://%s/reqmgr/reqMgr" % ALIAS +REQMGR2 = "https://%s/reqmgr2" % ALIAS +COUCH = "https://%s/couchdb" % ALIAS WEBURL = "%s/%s" % (COUCH, workqueueDBName) LOG_DB_URL = "%s/wmstats_logdb" % COUCH LOG_REPORTER = "global_workqueue" @@ -31,7 +39,7 @@ config = Configuration() config.section_("Agent") -config.Agent.hostName = HOST +config.Agent.hostName = ALIAS config.component_("WorkQueueManager") config.WorkQueueManager.namespace = "WMComponent.WorkQueueManager.WorkQueueManager" diff --git a/workqueue/deploy b/workqueue/deploy index 73d975de2cf..cca7eaf480c 100644 --- a/workqueue/deploy +++ b/workqueue/deploy @@ -56,7 +56,7 @@ deploy_workqueue_post() (mkcrontab; case $variant:$host in - prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | default:* ) + prod:vocms0140 | preprod:vocms0131 | dev:vocms0127 | dev:vocms0126 | default:* ) echo "${req_sync}" echo "${locations}" echo "${housekeep}" diff --git a/workqueue/monitoring.ini b/workqueue/monitoring.ini index e4d2c4634d7..1555aa34c34 100644 --- a/workqueue/monitoring.ini +++ b/workqueue/monitoring.ini @@ -1,4 +1,4 @@ -ENABLE_IF='host in ["vocms0140","vocms0131","vocms0127"]' +ENABLE_IF='host in ["vocms0140","vocms0131","vocms0127","vocms0126"]' # Glob pattern to search for log files under the svc logs directory, # and the regular expression to look for in those files.