Commit ded69c89 authored by Marian Babik's avatar Marian Babik
Browse files

added native ARC client and JobReset

parent 5538dffe
......@@ -29,6 +29,14 @@ RUN yum -y install gfal2-all gfal2-python gfal2-util globus-ftp-client \
globus-gsi-sysconfig globus-gsi-openssl-error globus-openssl-module \
globus-gsi-proxy-ssl
# ARC
RUN rpm -ivh https://download.nordugrid.org/packages/nordugrid-release/releases/6/centos/el7/x86_64/nordugrid-release-6-1.el7.noarch.rpm
RUN yum -y install nordugrid-arc-client nordugrid-arc-plugins-needed nordugrid-arc-plugins-globus
# ARC config
RUN mkdir /opt/omd/sites/$CHECK_MK_SITE/.arc
COPY docker/etf-cms/config/client.conf /opt/omd/sites/$CHECK_MK_SITE/.arc/
RUN chown -R $CHECK_MK_SITE /opt/omd/sites/$CHECK_MK_SITE/.arc/
# MW env
COPY docker/etf-cms/config/grid-env.sh /etc/profile.d/
RUN echo "source /etc/profile.d/grid-env.sh" >> /opt/omd/sites/$CHECK_MK_SITE/.profile
......
joblisttype=XML
\ No newline at end of file
......@@ -152,6 +152,11 @@ def run(url, ipv6=False):
log.warning("Unable to determine type for flavour %s" % flavor)
continue
res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', batch, queue)
# special handling: native ARC client
if flavor == 'ARC-CE' and host in ['ce0004.m45.ihep.su', 'ce0004.m45.ihep.su']:
c.add('org.sam.ARC-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
params={'args': {'--resource': '%s' % res, '--arc-rsl': '\'(memory=2000)\''}})
continue
for m in CE_STATE_METRICS:
if flavor == 'ARC-CE':
c.add(m, hosts=(service[0],), params={'args': {'--resource': '%s' % res,
......
......@@ -118,6 +118,31 @@ metrics = {
"passive" : True,
"depends" : "org.sam.CONDOR-JobState-/cms/Role=lcgadmin"
},
"check_js_reset": {
"command" : "/usr/lib64/nagios/plugins/check_js_reset",
"args" : {
"--vo" : "::VO",
"-t" : 600,
"--suffix" : "::CMS_FQAN_LCGADMIN",
"--work-dir" : "/var/lib/gridprobes",
"--vo-fqan" : "::CMS_FQAN_LCGADMIN",
"--time-limit": 15,
},
"docurl" : "https://etf.cern.ch/docs",
"doc" : "https://etf.cern.ch/docs",
"ocsp" : 0,
"max_check_attempts" : 1,
"timeout" : 600,
"interval" : 1440,
"retry_interval" : 1440
},
"org.sam.CONDOR-JobReset-/cms/Role=lcgadmin" : {
"extends" : "check_js_reset",
"args" : {
"--prefix" : "org.sam.CONDOR",
"--backend" : "scondor",
}
},
"org.cms.SRM-AllCMS-/cms/Role=production" : {
"command" : "/usr/libexec/grid-monitoring/probes/org.cms/srmvometrics.py",
"args" : {
......@@ -171,4 +196,15 @@ metrics = {
"retry_interval" : 15,
"max_check_attempts" : 4,
},
"org.sam.ARC-JobState-/cms/Role=lcgadmin" : {
"extends" : "check_js",
"depends" : "org.globus.GridProxy-Valid-/cms/Role=lcgadmin",
"interval" : 15,
"retry_interval" : 15,
"args" : {
"--prefix" : "org.sam.CONDOR",
"--backend" : "arc",
"--timeout-limits" : "global:1410,Queuing:1380"
}
},
}
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