Commit 930bcdbf authored by Marian Babik's avatar Marian Babik
Browse files

added 2G job requirements for htcondor-ce and cream-ce

parent 0bd277f3
......@@ -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