Commit e8f729d1 authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Merge branch 'master' of https://gitlab.cern.ch:8443/etf/cmssam

parents a4f6643a d132df39
......@@ -2,7 +2,7 @@
shopt -s expand_aliases
SCRIPT_REVISION="2020-03-30"
SCRIPT_REVISION="2020-07-17"
MAINTAINERS="Dave Dykstra and Edita Kizinevic"
SCRIPT_NAME=`basename "$0"`
......@@ -162,7 +162,13 @@ check_proxies() {
if ($2 && ! $ever_succeeded) || ! $2; then
proxy_IP=`echo $proxy | sed "s/$hostname/$IP_address/g"`
echo "Query $proxy started:" `date`
echo 'select 1 from dual' | FRONTIER_SERVER="$proxy_IP(serverurl=http://cmsfrontier.cern.ch:8000/FrontierProd)(failovertoserver=no)" FRONTIER_ID=$FRONTIER_ID fn-req > $output
echo 'select 1 from dual' | FRONTIER_LOG_LEVEL=warning FRONTIER_SERVER="$proxy_IP
(serverurl=http://cmsfrontier.cern.ch:8000/FrontierProd)
(serverurl=http://cmsfrontier1.cern.ch:8000/FrontierProd)
(serverurl=http://cmsfrontier2.cern.ch:8000/FrontierProd)
(serverurl=http://cmsfrontier3.cern.ch:8000/FrontierProd)
(serverurl=http://cmsfrontier4.cern.ch:8000/FrontierProd)
(failovertoserver=no)" FRONTIER_ID=$FRONTIER_ID fn-req > $output
if grep -q " 1 NUMBER" $output ; then
echo "$proxy_IP is OK"
ever_succeeded=true
......
......@@ -98,9 +98,9 @@ def run(url, ipv6=False):
if len(site) > 1:
log.warning("Host assigned to multiple sites: %s, %s picking first one" % (host, site))
if ipv6:
c.add("org.cms.SE-xrootd-read", hosts=(host,), params={ 'args': { '--site': site.pop(), '--endpoint': endpoint, '-6': ''}, '_tags': 'XROOTD'})
c.add("org.cms.SE-xrootd-read", hosts=(host,), params={'args': {'--site': site.pop(), '--endpoint': endpoint, '-6': ''}, '_tags': 'XROOTD'})
else:
c.add("org.cms.SE-xrootd-read", hosts=(host,), params={ 'args': { '--site': site.pop(), '--endpoint': endpoint, '-4': ''}, '_tags': 'XROOTD'})
c.add("org.cms.SE-xrootd-read", hosts=(host,), params={'args': {'--site': site.pop(), '--endpoint': endpoint, '-4': ''}, '_tags': 'XROOTD'})
# Queues
for service in services:
......@@ -110,9 +110,10 @@ def run(url, ipv6=False):
continue
if flavor == 'HTCONDOR-CE':
# special handling for HTCONDOR-CE, no queues
for m in CE_STATE_METRICS:
c.add(m, hosts=(service[0],), params={ 'args': { '--resource': 'htcondor://%s' % service[0] }})
continue
for m in CE_STATE_METRICS:
c.add(m, hosts=(service[0],), params={'args': {'--resource': 'htcondor://%s' % service[0],
'--jdl-ads': '\'+maxMemory=2000\''}})
continue
ce_resources = feed.get_ce_resources(host, flavor)
if ce_resources:
batch = ce_resources[0][0]
......@@ -124,7 +125,12 @@ def run(url, ipv6=False):
continue
res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', batch, queue)
for m in CE_STATE_METRICS:
c.add(m, hosts=(service[0],), params={ 'args': { '--resource': '%s' % res }})
if flavor == 'CREAM-CE':
c.add(m, hosts=(service[0],),
params={'args': {'--resource': '%s' % res,
'--jdl-ads': '\'cream_attributes=CERequirements=\"other.GlueHostMainMemoryRAMSize==2000\"\''}})
else:
c.add(m, hosts=(service[0],), params={'args': {'--resource': '%s' % res}})
else:
res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', 'nobatch', 'noqueue')
for m in CE_STATE_METRICS:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment