Commit 76cbeab1 authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Fixes in EFT plugin and other minor fixes

parent 970797b5
......@@ -10,6 +10,8 @@ at a site
import time
import os
import sys
import random
import string
from WMCore.Storage.SiteLocalConfig import loadSiteLocalConfig
......@@ -37,7 +39,8 @@ class StageOutDiagnostic:
self.tfc = None
self.datestamp = time.asctime(time.localtime(time.time()))
self.datestamp = self.datestamp.replace(" ", "-").replace(":", "_")
self.testLFN = "/store/unmerged/SAM/StageOutTest-%i-%s" % (os.getpid(), self.datestamp)
self.rndname = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(2))
self.testLFN = "/store/unmerged/SAM/StageOutTest-%s-%i-%s" % (self.rndname, os.getpid(), self.datestamp)
def __call__(self):
......
......@@ -40,11 +40,11 @@ fi
# ERROR : Could not identify basedir for home directory path: /
if [ "x$HAS_SINGULARITY" = "xTrue" ]; then
SINGULARITY_HOME=`mktemp -d`
echo "$OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv --bind /cvmfs --pwd /srv --containall $OSG_SINGULARITY_IMAGE_DEFAULT echo Hello World | grep Hello World"
echo "$OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv --bind /cvmfs --pwd /srv --contain --ipc --pid $OSG_SINGULARITY_IMAGE_DEFAULT echo Hello World | grep Hello World"
if ! ($OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv \
--bind /cvmfs \
--pwd /srv \
--containall \
--contain --ipc --pid \
"$OSG_SINGULARITY_IMAGE_DEFAULT" \
echo "Hello World" \
| grep "Hello World") 1>&2 \
......
......@@ -47,7 +47,7 @@ SE_METRICS = (
XROOT_METRICS = (
'org.cms.SE-xrootd-contain',
'org.cms.SE-xrootd-connection',
'org.cms.SE-xrootd-version'
'org.cms.SE-xrootd-version',
)
......@@ -101,9 +101,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': ''}})
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': ''}})
c.add("org.cms.SE-xrootd-read", hosts=(host,), params={ 'args': { '--site': site.pop(), '--endpoint': endpoint, '-4': ''}, '_tags': 'XROOTD'})
# Queues
for service in services:
......@@ -129,6 +129,9 @@ def run(url, ipv6=False):
for m in CE_STATE_METRICS:
c.add(m, hosts=(service[0],), params={ 'args': { '--resource': '%s' % res }})
else:
log.warning("No ce_resources found for host %s, BDII will used" % host)
res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', 'nobatch', 'noqueue')
for m in CE_STATE_METRICS:
c.add(m, hosts=(service[0],), params={ 'args': { '--resource': '%s' % res }})
c.serialize()
......@@ -4,7 +4,7 @@
Summary: WLCG Compliant Probes from %{site}
Name: nagios-plugins-wlcg-org.cms
Version: 1.1.49
Version: 1.1.51
Release: 1%{?dist}
License: GPL
......@@ -17,6 +17,9 @@ Requires: python >= 2.4
Requires: python-GridMon >= 1.1.3
Requires: python-ldap
Requires: python-suds >= 0.3.5
Requires: python-nap
Requires: xrootd-client
Requires: xrootd-python
AutoReqProv: no
BuildArch: noarch
......@@ -49,6 +52,12 @@ install --directory %{buildroot}/etc/cron.d
/etc/cron.d/cms_glexec
%changelog
* Fri May 4 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.51-1.
- added workaround in etf plugin for xrootd tag
* Thu May 3 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.50-1.
- added xrootd probe
- new etf plugin to remove usage of BDII
- made test file name for mc test more random
* Wed Apr 18 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.49-1.
- glexec test eliminated from isolation test
- removed double binds in singularity
......
......@@ -40,11 +40,11 @@ fi
# ERROR : Could not identify basedir for home directory path: /
if [ "x$HAS_SINGULARITY" = "xTrue" ]; then
SINGULARITY_HOME=`mktemp -d`
echo "$OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv --bind /cvmfs --pwd /srv --containall $OSG_SINGULARITY_IMAGE_DEFAULT echo Hello World | grep Hello World"
echo "$OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv --bind /cvmfs --pwd /srv --contain --ipc --pid $OSG_SINGULARITY_IMAGE_DEFAULT echo Hello World | grep Hello World"
if ! ($OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv \
--bind /cvmfs \
--pwd /srv \
--containall \
--contain --ipc --pid \
"$OSG_SINGULARITY_IMAGE_DEFAULT" \
echo "Hello World" \
| grep "Hello World") 1>&2 \
......
......@@ -13,11 +13,8 @@ mkdir -p $NAGDIR/org.cms/wnjob/org.cms.lcgadmin/etc/wn.d/org.cms
mkdir -p $NAGDIR/org.cms/wnjob/org.cms.production/etc/wn.d/org.cms
cp -aL $NAGCONF/org.cms.lcgadmin $NAGDIR/org.cms/wnjob/
cp -aL $NAGCONF/org.cms.production $NAGDIR/org.cms/wnjob/
#cp $NAGDIR/sam-vo-probes/srmvometrics.py $NAGDIR/org.cms/srmvometrics.py.ORIG
#sed -e 's/org.vos/org.cms/' $NAGDIR/org.cms/srmvometrics.py.ORIG > $NAGDIR/org.cms/srmvometrics.py
cp $SAMDIR/SiteTests/SE/srmvometrics.py $NAGDIR/org.cms/srmvometrics.py
chmod +x $NAGDIR/org.cms/srmvometrics.py
#rm -rf $NAGDIR/org.cms/srmvometrics.py.ORIG
cp $SAMDIR/SiteTests/SE/srmvometrics.py $SAMDIR/SiteTests/SE/cmssam_xrootd_endpnt.py $NAGDIR/org.cms/
chmod +x $NAGDIR/org.cms/srmvometrics.py $NAGDIR/org.cms/cmssam_xrootd_endpnt.py
mkdir -p $NAGDIR/config
cp -L $NAGCONF/emi.ce.CREAMCE.conf -L $NAGCONF/cms_glexec $NAGCONF/etf_plugin_cms.py $NAGCONF/cms_glexec-etf $NAGDIR/config/
srcdir=$SAMDIR
......
Supports Markdown
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