88e7faf860
This patch adds locking to rebuild_zebra.pl to ensure that simultaneous changes are prevented (as one is likely to overwrite the other). Incremental updates in daemon mode will skipped if the lock is busy and they will be picked up on the next pass. Non-daemon mode invocations will also exit immediately if they cannot get the lock unless the new flag -wait-for-lock is specified, in which case they will wait until the get the lock and then proceed. Supporting changes made to Makefile.PL and templates for the new locking directory (paralleling the other zebra lock directories). We stash the zebra_lockdir in koha-conf.xml so rebuild_zebra.pl can find it. To address earlier QA concerns we: 1. added code to check if flock is available and ignore locking if it's missing (from M. de Rooy) 2. changed default for adhoc invocations to abort if they cannot obtain the lock. Added option -wait-for-lock if the user prefers to wait until the lock is free, and then continue processing. 3. added missing entry to t/db_dependent/zebra_config.pl 4. added a fallback locking directory of /tmp Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Doug merged the original patch with the QA changes. Just for the record, noting here that the original patch was tested extensively too by Martin Renvoize. I have added a followup for some exceptional cases. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
88 lines
2.8 KiB
Bash
Executable file
88 lines
2.8 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it under the
|
|
# terms of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along with
|
|
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
|
|
# Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
### BEGIN INIT INFO
|
|
# Provides: koha-zebra-daemon
|
|
# Required-Start: $syslog $remote_fs
|
|
# Required-Stop: $syslog $remote_fs
|
|
# Default-Start: 2 3 4 5
|
|
# Default-Stop: 0 1 6
|
|
# Short-Description: Zebra server daemon for Koha indexing
|
|
### END INIT INFO
|
|
|
|
USER=__KOHA_USER__
|
|
GROUP=__KOHA_GROUP__
|
|
DBNAME=__DB_NAME__
|
|
NAME=koha-zebra-ctl.$DBNAME
|
|
LOGDIR=__LOG_DIR__
|
|
ERRLOG=$LOGDIR/koha-zebradaemon.err
|
|
STDOUT=$LOGDIR/koha-zebradaemon.log
|
|
OUTPUT=$LOGDIR/koha-zebradaemon-output.log
|
|
KOHA_CONF=__KOHA_CONF_DIR__/koha-conf.xml
|
|
RUNDIR=__ZEBRA_RUN_DIR__
|
|
LOCKDIR=__ZEBRA_LOCK_DIR__
|
|
# you may need to change this depending on where zebrasrv is installed
|
|
ZEBRASRV=__PATH_TO_ZEBRA__/zebrasrv
|
|
ZEBRAOPTIONS="-v none,fatal,warn"
|
|
|
|
test -f $ZEBRASRV || exit 0
|
|
|
|
OTHERUSER=''
|
|
if [[ $EUID -eq 0 ]]; then
|
|
OTHERUSER="--user=$USER.$GROUP"
|
|
fi
|
|
|
|
case "$1" in
|
|
start)
|
|
echo "Starting Zebra Server"
|
|
|
|
# create run and lock directories if needed;
|
|
# /var/run and /var/lock are completely cleared at boot
|
|
# on some platforms
|
|
if [[ ! -d $RUNDIR ]]; then
|
|
umask 022
|
|
mkdir -p $RUNDIR
|
|
if [[ $EUID -eq 0 ]]; then
|
|
chown $USER:$GROUP $RUNDIR
|
|
fi
|
|
fi
|
|
if [[ ! -d $LOCKDIR ]]; then
|
|
umask 022
|
|
mkdir -p $LOCKDIR
|
|
mkdir -p $LOCKDIR/biblios
|
|
mkdir -p $LOCKDIR/authorities
|
|
mkdir -p $LOCKDIR/rebuild
|
|
if [[ $EUID -eq 0 ]]; then
|
|
chown -R $USER:$GROUP $LOCKDIR
|
|
fi
|
|
fi
|
|
|
|
daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER -- $ZEBRASRV $ZEBRAOPTIONS -f $KOHA_CONF
|
|
;;
|
|
stop)
|
|
echo "Stopping Zebra Server"
|
|
daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER --stop -- $ZEBRASRV -f $KOHA_CONF
|
|
;;
|
|
restart)
|
|
echo "Restarting the Zebra Server"
|
|
daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER --restart -- $ZEBRASRV -f $KOHA_CONF
|
|
;;
|
|
*)
|
|
echo "Usage: /etc/init.d/$NAME {start|stop|restart}"
|
|
exit 1
|
|
;;
|
|
esac
|