Commit e1caf12c authored by Maarten Litmaath's avatar Maarten Litmaath
Browse files

v1.11:

- Now use the JAliEn and MonALISA module directories to select versions.
- MonALISA also needs the MYPROXY_SERVER defined for one of its checks.
- Cosmetic changes.
parent 43964cae
......@@ -27,7 +27,8 @@ JALIEN=<JAliEn version>
If it is required to run any shell command before starting either of the services, they can be added in `$HOME/.alien/config/CE.env` or `$HOME/.alien/config/ml.env`. Both files should typically contain a command to define the `X509_USER_PROXY` if needed for job submission by the JAliEn CE and which should then be monitored by MonALISA, for example as follows:
```
export X509_USER_PROXY=`ls -t /var/lib/vobox/alice/proxy_repository/*lcgadmin | sed q`
export X509_USER_PROXY=$(ls -t /var/lib/vobox/alice/proxy_repository/*lcgadmin | sed q)
export MYPROXY_SERVER=myproxy.cern.ch # only needed for MonALISA
```
> Note: the JAliEn CE needs to have a valid `VObox token` to be able to submit jobs.
......
#!/bin/bash
# JAliEn VObox Startup Scripts - CE
# v1.10 - 2021-10-30
# v1.11 - 2021-11-22
# Authors:
# Kalana Dananjaya <kwijethu@cern.ch>
# Costin Grigoras <Costin.Grigoras@cern.ch>
# Maarten Litmaath <Maarten.Litmaath@cern.ch>
ceClassName=alien.site.ComputingElement
jalienDir=/cvmfs/alice.cern.ch/el[67]-x86_64/Packages/JAliEn # matches el6 and el7
jPlatformDir=/cvmfs/alice.cern.ch/el[67]-x86_64 # matches el6 and el7
jalienDir=$jPlatformDir/Packages/JAliEn
jModuleDir=$jPlatformDir/Modules/modulefiles/JAliEn
commonConf="$confDir/version.properties"
export JALIEN_CONF_DIR=${JALIEN_CONF_DIR:-$HOME/.j/config}
......@@ -276,7 +278,7 @@ function start_ce() {
[[ -n "$jv" ]] || jv=pro
jalienVersion=$(
p=$jalienDir/$jv
p=$jModuleDir/$jv
(eval readlink -f "$p" || eval ls -ld "$p") | sed '$!d;s-.*/--'
)
......
#!/bin/bash
# JAliEn VObox Startup Scripts - MonaLisa
# v1.10 - 2021-10-30
# v1.11 - 2021-11-22
# Authors:
# Kalana Dananjaya <kwijethu@cern.ch>
# Costin Grigoras <Costin.Grigoras@cern.ch>
# Maarten Litmaath <Maarten.Litmaath@cern.ch>
monalisaDir=/cvmfs/alice.cern.ch/el7-x86_64/Packages/MonALISA
mlPlatformDir=/cvmfs/alice.cern.ch/el7-x86_64
monalisaDir=$mlPlatformDir/Packages/MonALISA
mlModuleDir=$mlPlatformDir/Modules/modulefiles/MonALISA
########################################################################################
# Write log to file
......@@ -414,7 +416,7 @@ function start_ml(){
mlv=${commonConfiguration[MONALISA]:-pro}
monalisaVersion=$(
p=$monalisaDir/$mlv
p=$mlModuleDir/$mlv
(eval readlink "$p" || eval ls -ld "$p") | sed '$!d;s-.*/--'
)
......@@ -487,11 +489,11 @@ function stop_ml(){
do
# request children to shutdown
kill -s HUP $pid &>/dev/null
sleep 1 ; echo -n "."
echo -n "."; sleep 1
kill -s HUP $pid &>/dev/null
sleep 1 ; echo -n "."
echo -n "."; sleep 1
kill -s TERM $pid &>/dev/null
sleep 2
echo -n "."; sleep 2
done
check_liveness_ml
......@@ -499,9 +501,9 @@ function stop_ml(){
if [[ $exit_code == 0 ]]
then
echo 'MonaLisa still running!'
echo ' MonaLisa still running!'
else
echo 'MonaLisa stopped'
echo ' MonaLisa stopped'
fi
}
......
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