debfranca
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

library/roles/smartgears/dataminer_app/templates/algorithms-updater.j2: Fix the check of the lock file logic. See https://support.d4science.org/issues/11182

This commit is contained in:
Andrea Dell'Amico 2018-02-14 12:48:24 +01:00
parent 86fe9f876f
commit 0115c852e3
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
R/templates/update_r_packages.sh.j2
View File

@ -77,7 +77,7 @@ function init_env() {
OLDPROC=$( cat $LOCK_FILE ) OLDPROC=$( cat $LOCK_FILE )
OLDPROC_RUNNING=$( ps auwwx | grep -v grep | grep $OLDPROC | awk '{ print $2 }' ) OLDPROC_RUNNING=$( ps auwwx | grep -v grep | grep $OLDPROC | awk '{ print $2 }' )
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ] ; then if [ ! -z "$OLDPROC_RUNNING" ] ; then
logger "update_r_packages: pid of the already running process: $OLDPROC_RUNNING" logger "update_r_packages: pid of the already running process: $OLDPROC_RUNNING"
OLDPROC_RUNNING_TIME=$( ps -o etimes= -p ${OLDPROC_RUNNING} ) OLDPROC_RUNNING_TIME=$( ps -o etimes= -p ${OLDPROC_RUNNING} )
if [ $OLDPROC_RUNNING_TIME -gt $UPDATER_PROCESS_MAX_RUNTIME ] ; then if [ $OLDPROC_RUNNING_TIME -gt $UPDATER_PROCESS_MAX_RUNTIME ] ; then
@ -92,6 +92,8 @@ function init_env() {
logger "update_r_packages: lock file exist but the process not. Continuing." logger "update_r_packages: lock file exist but the process not. Continuing."
rm -fr $TMP_FILES_DIR rm -fr $TMP_FILES_DIR
fi fi
else
logger 'update_r_packages: no other jobs running, proceeding.'
fi fi
RETVAL= RETVAL=
echo "$PROCNUM" > $LOCK_FILE echo "$PROCNUM" > $LOCK_FILE

24
smartgears/dataminer_app/templates/algorithms-updater.j2
View File

@ -3,6 +3,7 @@
set -e set -e
set -o pipefail set -o pipefail
PROCNUM=$$
INFRA_REFERENCE={{ dataminer_infra_reference }} INFRA_REFERENCE={{ dataminer_infra_reference }}
ADD_ALGORITHM_DIR={{ smartgears_user_home }}/algorithmInstaller ADD_ALGORITHM_DIR={{ smartgears_user_home }}/algorithmInstaller
ADD_ALGORITHM_PATH={{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh ADD_ALGORITHM_PATH={{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh
@ -15,7 +16,10 @@ ALGORITHMS_INSTALLED_FILE=${LOG_DIR}/already_installed_algorithms.txt
ALGORITHMS_INSTALLED_SORTED_FILE=${LOG_DIR}/already_installed_algorithms_sorted.txt ALGORITHMS_INSTALLED_SORTED_FILE=${LOG_DIR}/already_installed_algorithms_sorted.txt
LOCK_FILE=${LOG_DIR}/.algorithms_updater.lock LOCK_FILE=${LOG_DIR}/.algorithms_updater.lock
ALGO_DIR={{ dataminer_wps_algorithms_dest }}/${INFRA_REFERENCE} ALGO_DIR={{ dataminer_wps_algorithms_dest }}/${INFRA_REFERENCE}
RUNNING_JOB= # In seconds. 60*60*6=21600s (6h)
UPDATER_PROCESS_MAX_RUNTIME=21600
OLDPROC=
OLDPROC_RUNNING=
RUNNING_JOB_RETVAL= RUNNING_JOB_RETVAL=
trap "logger 'algorithms-updater: trap intercepted, exiting.' ; cleanup 1" SIGHUP SIGINT SIGTERM trap "logger 'algorithms-updater: trap intercepted, exiting.' ; cleanup 1" SIGHUP SIGINT SIGTERM
@ -38,13 +42,23 @@ function check_lock_file() {
if [ -f $LOCK_FILE ] ; then if [ -f $LOCK_FILE ] ; then
set +o pipefail set +o pipefail
set +e set +e
RUNNING_JOB=$( /bin/pidof -s -x /usr/local/bin/algorithms-updater ) OLDPROC=$( cat $LOCK_FILE )
OLDPROC_RUNNING=$( ps auwwx | grep -v grep | grep $OLDPROC | awk '{ print $2 }' )
RUNNING_JOB_RETVAL=$? RUNNING_JOB_RETVAL=$?
if [ $RUNNING_JOB_RETVAL -eq 0 ] ; then if [ ! -z "$OLDPROC_RUNNING" ] ; then
logger 'algorithms-updater: another job still running, exiting.' logger "algorithms_updater: pid of the already running process: $OLDPROC_RUNNING"
OLDPROC_RUNNING_TIME=$( ps -o etimes= -p ${OLDPROC_RUNNING} )
if [ $OLDPROC_RUNNING_TIME -gt $UPDATER_PROCESS_MAX_RUNTIME ] ; then
logger "algorithms_updater: process $OLDPROC_RUNNING was running for $OLDPROC_RUNNING_TIME seconds. Got stuck, killing it"
kill -9 $OLDPROC_RUNNING
rm -f $LOCK_FILE
else
logger "algorithms_updater: another process is running, exiting."
rm -fr $OUT_DIR rm -fr $OUT_DIR
exit 0 exit 0
fi
else else
logger "algorithms_updater: lock file exist but the process not. Continuing."
rm -f $LOCK_FILE rm -f $LOCK_FILE
fi fi
else else
@ -52,7 +66,7 @@ function check_lock_file() {
fi fi
set -o pipefail set -o pipefail
set -e set -e
echo "$$" > $LOCK_FILE echo "$PROCNUM" > $LOCK_FILE
} }
function update_svn_repo() { function update_svn_repo() {