From 993edcc972269424901357578568b48af70a6a63 Mon Sep 17 00:00:00 2001 From: Balamurugan Arumugam Date: Mon, 13 Sep 2010 03:40:16 +0000 Subject: extras: modify run level scripts to support glusterd. Signed-off-by: Bala.JA Signed-off-by: Pavan Vilas Sondur Signed-off-by: Vijay Bellur BUG: 1589 (Change init.d scripts to include glusterd) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1589 --- configure.ac | 8 +-- extras/init.d/Makefile.am | 6 +- extras/init.d/glusterd-Debian.in | 99 +++++++++++++++++++++++++++++++ extras/init.d/glusterd-Redhat.in | 53 +++++++++++++++++ extras/init.d/glusterd-SuSE.in | 74 +++++++++++++++++++++++ extras/init.d/glusterd.plist.in | 13 +++++ extras/init.d/glusterfs-server.plist.in | 15 ----- extras/init.d/glusterfsd-Debian.in | 100 -------------------------------- extras/init.d/glusterfsd-Redhat.in | 54 ----------------- extras/init.d/glusterfsd-SuSE.in | 75 ------------------------ glusterfs.spec.in | 6 +- 11 files changed, 249 insertions(+), 254 deletions(-) create mode 100755 extras/init.d/glusterd-Debian.in create mode 100755 extras/init.d/glusterd-Redhat.in create mode 100755 extras/init.d/glusterd-SuSE.in create mode 100644 extras/init.d/glusterd.plist.in delete mode 100644 extras/init.d/glusterfs-server.plist.in delete mode 100755 extras/init.d/glusterfsd-Debian.in delete mode 100755 extras/init.d/glusterfsd-Redhat.in delete mode 100755 extras/init.d/glusterfsd-SuSE.in diff --git a/configure.ac b/configure.ac index 81f58317d3c..07ee721502b 100644 --- a/configure.ac +++ b/configure.ac @@ -106,10 +106,10 @@ AC_CONFIG_FILES([Makefile extras/Makefile extras/glusterfs-defrag extras/init.d/Makefile - extras/init.d/glusterfs-server.plist - extras/init.d/glusterfsd-Debian - extras/init.d/glusterfsd-Redhat - extras/init.d/glusterfsd-SuSE + extras/init.d/glusterd.plist + extras/init.d/glusterd-Debian + extras/init.d/glusterd-Redhat + extras/init.d/glusterd-SuSE extras/benchmarking/Makefile extras/volgen/Makefile extras/volgen/glusterfs-volgen diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am index c090161780b..66715f4314a 100644 --- a/extras/init.d/Makefile.am +++ b/extras/init.d/Makefile.am @@ -1,5 +1,5 @@ -EXTRA_DIST = glusterfsd-Debian glusterfsd-Redhat glusterfsd-SuSE glusterfs-server.plist +EXTRA_DIST = glusterd-Debian glusterd-Redhat glusterd-SuSE glusterd.plist CLEANFILES = @@ -8,12 +8,12 @@ launchddir = @launchddir@ $(GF_DISTRIBUTION): $(mkdir_p) $(DESTDIR)$(initdir) - $(INSTALL_PROGRAM) glusterfsd-$(GF_DISTRIBUTION) $(DESTDIR)$(initdir)/glusterfsd + $(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(initdir)/glusterd install-exec-local: $(GF_DISTRIBUTION) install-data-local: if GF_DARWIN_HOST_OS $(mkdir_p) $(DESTDIR)$(launchddir) - $(INSTALL_PROGRAM) glusterfs-server.plist $(DESTDIR)$(launchddir)/com.gluster.glusterfs.plist + $(INSTALL_PROGRAM) glusterd.plist $(DESTDIR)$(launchddir)/com.gluster.glusterd.plist endif diff --git a/extras/init.d/glusterd-Debian.in b/extras/init.d/glusterd-Debian.in new file mode 100755 index 00000000000..86b66d424b1 --- /dev/null +++ b/extras/init.d/glusterd-Debian.in @@ -0,0 +1,99 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: glusterd +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Gluster File System service for volume management +# Description: Gluster File System service for volume management +### END INIT INFO + +# Author: Chris AtLee +# Patched by: Matthias Albert < matthias@linux4experts.de> + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +NAME=glusterd +SCRIPTNAME=/etc/init.d/$NAME +DAEMON=@prefix@/sbin/$NAME +PIDFILE=/var/run/$NAME.pid +GLUSTERD_OPTS="" +PID=`test -f $PIDFILE && cat $PIDFILE` + + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +check_config() +{ + if [ ! -f "$CONFIGFILE" ]; then + echo "Config file $CONFIGFILE is missing...exiting!" + exit 0 + fi +} + +do_start() +{ + check_config; + pidofproc -p $PIDFILE $DAEMON >/dev/null + status=$? + if [ $status -eq 0 ]; then + log_success_msg "glusterd service is already running with pid $PID" + else + log_daemon_msg "Starting glusterd service" "glusterd" + start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $GLUSTERD_OPTS + log_end_msg $? + start_daemon -p $PIDFILE $DAEMON -f $CONFIGFILE + return $? + fi +} + +do_stop() +{ + log_daemon_msg "Stopping glusterd service" "glusterd" + start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE + log_end_msg $? + rm -f $PIDFILE + killproc -p $PIDFILE $DAEMON + return $? +} + +do_status() +{ + pidofproc -p $PIDFILE $DAEMON >/dev/null + status=$? + if [ $status -eq 0 ]; then + log_success_msg "glusterd service is running with pid $PID" + else + log_failure_msg "glusterd service is not running." + fi + exit $status +} + +case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + status) + do_status; + ;; + restart|force-reload) + do_stop + sleep 2 + do_start + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + diff --git a/extras/init.d/glusterd-Redhat.in b/extras/init.d/glusterd-Redhat.in new file mode 100755 index 00000000000..15da246870a --- /dev/null +++ b/extras/init.d/glusterd-Redhat.in @@ -0,0 +1,53 @@ +#!/bin/bash +# +# chkconfig: 35 90 12 +# description: Gluster File System service for volume management +# + +# Get function from functions library +. /etc/rc.d/init.d/functions + +BASE=glusterd +GLUSTERD_BIN=@exec_prefix@/sbin/$BASE +GLUSTERD_OPTS="" +GLUSTERD="$GLUSTERD_BIN $GLUSTERD_OPTS" +RETVAL=0 + +# Start the service $BASE +start() +{ + echo $"Starting $BASE:" + daemon $GLUSTERD + RETVAL=$? + [ $RETVAL -ne 0 ] && exit $RETVAL +} + +# Stop the service $BASE +stop() +{ + echo $"Stopping $BASE:" + killproc $BASE +} + + +### service arguments ### +case $1 in + start) + start + ;; + stop) + stop + ;; + status) + status $BASE + ;; + restart) + $0 stop + $0 start + ;; + *) + echo $"Usage: $0 {start|stop|status|restart}." + exit 1 +esac + +exit 0 diff --git a/extras/init.d/glusterd-SuSE.in b/extras/init.d/glusterd-SuSE.in new file mode 100755 index 00000000000..16cf8de6a13 --- /dev/null +++ b/extras/init.d/glusterd-SuSE.in @@ -0,0 +1,74 @@ +#!/bin/bash +# +### BEGIN INIT INFO +# Provides: glusterd +# Required-Start: $local_fs $network +# Required-Stop: +# Default-Start: 3 5 +# Default-Stop: +# Short-Description: Gluster File System service for volume management +# Description: Gluster File System service for volume management +### END INIT INFO + +# Get function from functions library + +. /etc/rc.status + +BASE=glusterd +GLUSTERD_BIN=@prefix@/sbin/$BASE +GLUSTERD_OPTS="" +GLUSTERD="$GLUSTERD_BIN $GLUSTERD_OPTS" +RETVAL=0 + +# Start the service $BASE +start() +{ + echo -n $"Starting $BASE:" + startproc $GLUSTERD + return $? +} + +# Stop the service $BASE +stop() +{ + echo $"Stopping $BASE:" + killproc $BASE + return $? +} + + +### service arguments ### +case $1 in + start) + start || { + rc_status -v + rc_exit + } + rc_status -v + ;; + stop) + stop || { + rc_status -v + rc_exit + } + rc_status -v + ;; + status) + echo -n " glusterd" + if ! checkproc $BASE ;then + echo " not running" + rc_failed 3 + fi + rc_status -v + ;; + restart) + $0 stop + $0 start + rc_status + ;; + *) + echo $"Usage: $0 {start|stop|status|restart}." + exit 1 +esac + +exit 0 diff --git a/extras/init.d/glusterd.plist.in b/extras/init.d/glusterd.plist.in new file mode 100644 index 00000000000..7385fa486df --- /dev/null +++ b/extras/init.d/glusterd.plist.in @@ -0,0 +1,13 @@ + + + + + Label + com.gluster.glusterd + ProgramArguments + + @prefix@/sbin/glusterd + -N + + + diff --git a/extras/init.d/glusterfs-server.plist.in b/extras/init.d/glusterfs-server.plist.in deleted file mode 100644 index 624dfe22d80..00000000000 --- a/extras/init.d/glusterfs-server.plist.in +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Label - com.gluster.glusterfs - ProgramArguments - - @prefix@/sbin/glusterfsd - -N - -f - @prefix@/etc/glusterfs/server.vol - - - diff --git a/extras/init.d/glusterfsd-Debian.in b/extras/init.d/glusterfsd-Debian.in deleted file mode 100755 index a0c83d53569..00000000000 --- a/extras/init.d/glusterfsd-Debian.in +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: glusterfsd -# Required-Start: $local_fs $network -# Required-Stop: $local_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: gluster server -# Description: This file starts / stops the gluster server -### END INIT INFO - -# Author: Chris AtLee -# Patched by: Matthias Albert < matthias@linux4experts.de> - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -NAME=glusterfsd -SCRIPTNAME=/etc/init.d/$NAME -DAEMON=@prefix@/sbin/$NAME -PIDFILE=/var/run/$NAME.pid -CONFIGFILE=/etc/glusterfs/glusterfsd.vol -GLUSTERFS_OPTS="-f $CONFIGFILE" -PID=`test -f $PIDFILE && cat $PIDFILE` - - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -. /lib/lsb/init-functions - -check_config() -{ - if [ ! -f "$CONFIGFILE" ]; then - echo "Config file $CONFIGFILE is missing...exiting!" - exit 0 - fi -} - -do_start() -{ - check_config; - pidofproc -p $PIDFILE $DAEMON >/dev/null - status=$? - if [ $status -eq 0 ]; then - log_success_msg "glusterfs server is already running with pid $PID" - else - log_daemon_msg "Starting glusterfs server" "glusterfsd" - start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $GLUSTERFS_OPTS - log_end_msg $? - start_daemon -p $PIDFILE $DAEMON -f $CONFIGFILE - return $? - fi -} - -do_stop() -{ - log_daemon_msg "Stopping glusterfs server" "glusterfsd" - start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE - log_end_msg $? - rm -f $PIDFILE - killproc -p $PIDFILE $DAEMON - return $? -} - -do_status() -{ - pidofproc -p $PIDFILE $DAEMON >/dev/null - status=$? - if [ $status -eq 0 ]; then - log_success_msg "glusterfs server is running with pid $PID" - else - log_failure_msg "glusterfs server is not running." - fi - exit $status -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - status) - do_status; - ;; - restart|force-reload) - do_stop - sleep 2 - do_start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - diff --git a/extras/init.d/glusterfsd-Redhat.in b/extras/init.d/glusterfsd-Redhat.in deleted file mode 100755 index 2f5009ef78f..00000000000 --- a/extras/init.d/glusterfsd-Redhat.in +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# chkconfig: 35 90 12 -# description: Glusterfsd server -# - -# Get function from functions library -. /etc/rc.d/init.d/functions - -BASE=glusterfsd -GLUSTERFSD_BIN=@exec_prefix@/sbin/$BASE -CONFIGFILE=/etc/glusterfs/glusterfsd.vol -GLUSTERFSD_OPTS="-f $CONFIGFILE" -GSERVER="$GLUSTERFSD_BIN $GLUSTERFSD_OPTS" -RETVAL=0 - -# Start the service $BASE -start() -{ - echo $"Starting $BASE:" - daemon $GSERVER - RETVAL=$? - [ $RETVAL -ne 0 ] && exit $RETVAL -} - -# Stop the service $BASE -stop() -{ - echo $"Stopping $BASE:" - killproc $BASE -} - - -### service arguments ### -case $1 in - start) - start - ;; - stop) - stop - ;; - status) - status $BASE - ;; - restart) - $0 stop - $0 start - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}." - exit 1 -esac - -exit 0 diff --git a/extras/init.d/glusterfsd-SuSE.in b/extras/init.d/glusterfsd-SuSE.in deleted file mode 100755 index 43552bb499c..00000000000 --- a/extras/init.d/glusterfsd-SuSE.in +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: glusterfsd -# Required-Start: $local_fs $network -# Required-Stop: -# Default-Start: 3 5 -# Default-Stop: -# Short-Description: GlusterFS server daemon -# Description: All necessary services for GlusterFS clients -### END INIT INFO - -# Get function from functions library - -. /etc/rc.status - -BASE=glusterfsd -GLUSTERFSD_BIN=@prefix@/sbin/$BASE -CONFIGFILE=/etc/glusterfs/glusterfsd.vol -GLUSTERFSD_OPTS="-f $CONFIGFILE" -GSERVER="$GLUSTERFSD_BIN $GLUSTERFSD_OPTS" -RETVAL=0 - -# Start the service $BASE -start() -{ - echo -n $"Starting $BASE:" - startproc $GSERVER - return $? -} - -# Stop the service $BASE -stop() -{ - echo $"Stopping $BASE:" - killproc $BASE - return $? -} - - -### service arguments ### -case $1 in - start) - start || { - rc_status -v - rc_exit - } - rc_status -v - ;; - stop) - stop || { - rc_status -v - rc_exit - } - rc_status -v - ;; - status) - echo -n " glusterfsd" - if ! checkproc $BASE ;then - echo " not running" - rc_failed 3 - fi - rc_status -v - ;; - restart) - $0 stop - $0 start - rc_status - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}." - exit 1 -esac - -exit 0 diff --git a/glusterfs.spec.in b/glusterfs.spec.in index ffb87d8fc61..b17e5608734 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -119,14 +119,14 @@ find %{buildroot}%{_libdir} -name '*.a' | xargs rm -f %post core /sbin/ldconfig -n %{_libdir} -/sbin/chkconfig --add glusterfsd +/sbin/chkconfig --add glusterd %postun core /sbin/ldconfig -n %{_libdir} %preun core if [ $1 -eq 0 ]; then - /sbin/chkconfig --del glusterfsd + /sbin/chkconfig --del glusterd fi %files core @@ -152,7 +152,7 @@ fi %exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma* %exclude %{_libdir}/glusterfs/%{version}/xlator/mount/fuse* %config %{_sysconfdir}/glusterfs -%{_sysconfdir}/init.d/glusterfsd +%{_sysconfdir}/init.d/glusterd %{_includedir}/glusterfs %exclude %{_includedir}/glusterfs/y.tab.h %{_libdir}/*.so -- cgit