From 9b14f7bb5e00197a88884605d8f27de738534522 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 14 Sep 2012 15:26:12 -0300 Subject: [PATCH] Bug 8773 - Start per-instance koha-index-daemon in .deb setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Short: Launch a koha-index-daemon (from Koha::Contrib::tamil) process for each enabled instance. Enabling/disabling the use of the indexer is handled using a new(ly introduced) /etc/default/koha-common config file that can be used for other stuff too, and is the Debian way of handling init scripts control variables[1]. Long: Using an indexing daemon avoids launching a new interpreter each time the cron triggers the indexing, and also allows sub-minute incremental reindexing, a requirement from our librarians.[2] Using the indexer daemon should remain "experimental" so is disabled by default. To enable the use of the indexer the user has to tweak the /etc/default/koha-common config file (introduced by this patch). Specifically the USE_INDEXER_DAEMON variable, which is clearly explained in the file. Update frecquency defaults to 30 sec, and can be changed by tweaking the /etc/default/koha-common config file too. This patch relies on Koha::Contrib::Tamil's koha-index-daemon script [3], but could be easily adjusted to use another if we got a new one (SolR?). As Robin proposed it check for availability of the relevant files before trying to spawn the daemon. If there's something I could change to make this patches better just let me know. Note: there was a problem Robin found regarding the spawned processes forgetting the PERL5LIB and/or KOHA_CONF env variables, this is fixed in this version with the inclusion of the 'export' keyword for the relevant variables. Regards To+ [1] Section 9.3.2 of http://www.debian.org/doc/debian-policy/ch-opersys.html [2] This is the .deb version of http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8519 [3] The default cronjob that is set using the debian/koha-common.cron.d file is being disbaled by this patch to avoid collision. Sponsored-by: Universidad Nacional de Córdoba --- debian/docs/koha-common.xml | 21 +++++++++ debian/docs/koha-restart-indexer.xml | 43 +++++++++++++++++ debian/docs/koha-start-indexer.xml | 43 +++++++++++++++++ debian/docs/koha-stop-indexer.xml | 43 +++++++++++++++++ debian/koha-common.cron.d | 1 + debian/koha-common.default | 16 +++++++ debian/koha-common.init | 32 ++++++------- debian/koha-common.install | 3 ++ debian/scripts/koha-create | 3 ++ debian/scripts/koha-restart-indexer | 90 ++++++++++++++++++++++++++++++++++++ debian/scripts/koha-start-indexer | 90 ++++++++++++++++++++++++++++++++++++ debian/scripts/koha-stop-indexer | 83 +++++++++++++++++++++++++++++++++ 12 files changed, 450 insertions(+), 18 deletions(-) create mode 100644 debian/docs/koha-restart-indexer.xml create mode 100644 debian/docs/koha-start-indexer.xml create mode 100644 debian/docs/koha-stop-indexer.xml create mode 100644 debian/koha-common.default create mode 100755 debian/scripts/koha-restart-indexer create mode 100755 debian/scripts/koha-start-indexer create mode 100755 debian/scripts/koha-stop-indexer diff --git a/debian/docs/koha-common.xml b/debian/docs/koha-common.xml index d602aa9..198ef21 100644 --- a/debian/docs/koha-common.xml +++ b/debian/docs/koha-common.xml @@ -145,6 +145,27 @@ Stop Zebra for named Koha instances. + + + + + Start the indexer daemon for named Koha instances. + + + + + + + Restart the indexer daemon for named Koha instances. + + + + + + + Stop the indexer daemon for named Koha instances. + + diff --git a/debian/docs/koha-restart-indexer.xml b/debian/docs/koha-restart-indexer.xml new file mode 100644 index 0000000..376444e --- /dev/null +++ b/debian/docs/koha-restart-indexer.xml @@ -0,0 +1,43 @@ +
+koha-restart-indexer + +Koha is the first free software library automation package. + + The Koha Communnity + http://koha-community.org/ + + + + + + + koha-restart-indexer + 8 + + + + koha-restart-indexer + Restart the indexer daemon for named Koha instances. + UNIX/Linux + + + + + koha-restart-indexer instancename + + + + Description + Restart the indexer daemon for named Koha instances. + + + See also + + koha-start-indexer(8) + koha-stop-indexer(8) + + + + + +
diff --git a/debian/docs/koha-start-indexer.xml b/debian/docs/koha-start-indexer.xml new file mode 100644 index 0000000..9565bff --- /dev/null +++ b/debian/docs/koha-start-indexer.xml @@ -0,0 +1,43 @@ +
+koha-start-indexer + +Koha is the first free software library automation package. + + The Koha Communnity + http://koha-community.org/ + + + + + + + koha-start-indexer + 8 + + + + koha-start-indexer + Start the indexer daemon for named Koha instances. + UNIX/Linux + + + + + koha-start-indexer instancename + + + + Description + Start the indexer daemon for named Koha instances. + + + See also + + koha-restart-indexer(8) + koha-stop-indexer(8) + + + + + +
diff --git a/debian/docs/koha-stop-indexer.xml b/debian/docs/koha-stop-indexer.xml new file mode 100644 index 0000000..f7fa9b4 --- /dev/null +++ b/debian/docs/koha-stop-indexer.xml @@ -0,0 +1,43 @@ +
+koha-stop-indexer + +Koha is the first free software library automation package. + + The Koha Communnity + http://koha-community.org/ + + + + + + + koha-stop-indexer + 8 + + + + koha-stop-indexer + Stop indexer daemon for named Koha instances. + UNIX/Linux + + + + + koha-stop-indexer instancename + + + + Description + Stop indexer daemon for named Koha instances. + + + See also + + koha-restart-indexer(8) + koha-start-indexer(8) + + + + + +
diff --git a/debian/koha-common.cron.d b/debian/koha-common.cron.d index cd7f3c2..9de8e31 100644 --- a/debian/koha-common.cron.d +++ b/debian/koha-common.cron.d @@ -6,5 +6,6 @@ SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +# Comment the following line if you want to use the experimental koha-index-daemon integration */5 * * * * root test -x /usr/sbin/koha-rebuild-zebra && koha-rebuild-zebra $(koha-list --enabled) */15 * * * * root koha-foreach --enabled --email /usr/share/koha/bin/cronjobs/process_message_queue.pl diff --git a/debian/koha-common.default b/debian/koha-common.default new file mode 100644 index 0000000..e083a6c --- /dev/null +++ b/debian/koha-common.default @@ -0,0 +1,16 @@ +## General koha-common default options file + +# If you want to use the koha-index-daemon script that is part of the +# Koha::Contrib::Tamil package instead of the cronjob, set USE_INDEXER_DAEMON +# to "yes". More information can be found here: +# http://wiki.koha-community.org/wiki/PackagesIndexDaemon +# Note: You should comment the relevant line in /etc/cron.d/koha-common +# +# The default value is "no" +#USE_INDEXER_DAEMON="no" + +# If you are using the koha-index-daemon you can set the frecquency (in sec) +# of the indexes update. +# +# The default value is 30 +#INDEXER_TIMEOUT=30 diff --git a/debian/koha-common.init b/debian/koha-common.init index 9a285a3..3295e9a 100755 --- a/debian/koha-common.init +++ b/debian/koha-common.init @@ -18,17 +18,14 @@ # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Koha ILS" -NAME=daemonexecutablename -DAEMON=/usr/sbin/$NAME -DAEMON_ARGS="--options args" -PIDFILE=/var/run/$NAME.pid +NAME="koha-common" SCRIPTNAME=/etc/init.d/$NAME # Exit if the package is not installed [ -x /usr/sbin/koha-start-zebra ] || exit 0 # Read configuration variable file if it is present -# [ -r /etc/default/$NAME ] && . /etc/default/$NAME +[ -r /etc/default/$NAME ] && . /etc/default/$NAME # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh @@ -46,6 +43,10 @@ do_start() koha-create-dirs $(koha-list) koha-start-zebra $(koha-list --enabled) koha-start-sip $(koha-list --enabled) + + if [ "$USE_INDEXER_DAEMON" = "yes" ]; then + koha-start-indexer $(koha-list --enabled) + fi } # @@ -56,6 +57,10 @@ do_stop() # We stop everything, including disabled ones. koha-stop-zebra $(koha-list) || true koha-stop-sip $(koha-list) || true + + if [ "$USE_INDEXER_DAEMON" = "yes" ]; then + koha-stop-indexer $(koha-list --enabled) + fi } # @@ -65,6 +70,10 @@ do_reload() { koha-restart-zebra $(koha-list --enabled) koha-stop-sip $(koha-list) || true koha-start-sip $(koha-list --enabled) + + if [ "$USE_INDEXER_DAEMON" = "yes" ]; then + koha-restart-indexer $(koha-list --enabled) + fi } case "$1" in @@ -84,18 +93,6 @@ case "$1" in *) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; -# status) -# status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? -# ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; restart|force-reload) # # If the "reload" option is implemented then remove the @@ -119,7 +116,6 @@ case "$1" in ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - #echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 exit 3 ;; esac diff --git a/debian/koha-common.install b/debian/koha-common.install index 810aadc..21073e9 100644 --- a/debian/koha-common.install +++ b/debian/koha-common.install @@ -22,11 +22,14 @@ debian/scripts/koha-mysql usr/sbin debian/scripts/koha-rebuild-zebra usr/sbin debian/scripts/koha-remove usr/sbin debian/scripts/koha-reset-passwd usr/sbin +debian/scripts/koha-restart-indexer usr/sbin debian/scripts/koha-restart-zebra usr/sbin debian/scripts/koha-restore usr/sbin debian/scripts/koha-run-backups usr/sbin debian/scripts/koha-shell usr/sbin +debian/scripts/koha-start-indexer usr/sbin debian/scripts/koha-start-zebra usr/sbin +debian/scripts/koha-stop-indexer usr/sbin debian/scripts/koha-stop-zebra usr/sbin debian/scripts/koha-translate usr/sbin debian/scripts/koha-upgrade-schema usr/sbin diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 8211e1c..9f3b595 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -340,6 +340,9 @@ then # Start Zebra. koha-start-zebra "$name" + + # Start Indexer daemon + koha-start-indexer "$name" fi diff --git a/debian/scripts/koha-restart-indexer b/debian/scripts/koha-restart-indexer new file mode 100755 index 0000000..07cbbb4 --- /dev/null +++ b/debian/scripts/koha-restart-indexer @@ -0,0 +1,90 @@ +#!/bin/sh +# +# koha-restart-indexer - Restart Indexer Daemon for Koha instances +# Copyright 2012 Tomás Cohen Arazi @ Universidad Nacional de Córdoba +# +# This program 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 3 of the License, or +# (at your option) any later version. +# +# This program 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 this program. If not, see . + +set -e + +. /lib/lsb/init-functions + +# Read configuration variable file if it is present +[ -r /etc/default/koha-common ] && . /etc/default/koha-common + +if [[ $INDEXER_TIMEOUT != *[!0-9]* ]]; then + INDEXER_TIMEOUT=30 +fi + +warn() +{ + echo "$@" 1>&2 +} + +is_instance() +{ + local instancename=$1 + + if find /etc/koha/sites -mindepth 1 -maxdepth 1 \ + -type d -printf '%f\n'\ + | grep -q -x $instancename ; then + return 0 + else + return 1 + fi +} + +INDEXDAEMON="koha-index-daemon" +export PERL5LIB="/usr/share/koha/lib" + +if [ ! -e /usr/share/perl5/Koha/Contrib/Tamil/IndexerDaemon.pm ] ; then + MSG=`cat <. + +set -e + +. /lib/lsb/init-functions + +# Read configuration variable file if it is present +[ -r /etc/default/koha-common ] && . /etc/default/koha-common + +if [[ $INDEXER_TIMEOUT != *[!0-9]* ]]; then + INDEXER_TIMEOUT=30 +fi + +warn() +{ + echo "$@" 1>&2 +} + +is_instance() +{ + local instancename=$1 + + if find /etc/koha/sites -mindepth 1 -maxdepth 1 \ + -type d -printf '%f\n'\ + | grep -q -x $instancename ; then + return 0 + else + return 1 + fi +} + +INDEXDAEMON="koha-index-daemon" +export PERL5LIB="/usr/share/koha/lib" + +if [ ! -e /usr/share/perl5/Koha/Contrib/Tamil/IndexerDaemon.pm ] ; then + MSG=`cat <. + +set -e + +. /lib/lsb/init-functions + +warn() +{ + echo "$@" 1>&2 +} + +is_instance() +{ + local instancename=$1 + + if find /etc/koha/sites -mindepth 1 -maxdepth 1 \ + -type d -printf '%f\n'\ + | grep -q -x $instancename ; then + return 0 + else + return 1 + fi +} + +INDEXDAEMON="koha-index-daemon" +export PERL5LIB="/usr/share/koha/lib" + +if [ ! -e /usr/share/perl5/Koha/Contrib/Tamil/IndexerDaemon.pm ] ; then + MSG=`cat <