extras: modify run level scripts to support glusterd.
Signed-off-by: Bala.JA <bala@gluster.com> Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1589 (Change init.d scripts to include glusterd) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1589
This commit is contained in:
Balamurugan Arumugam
Vijay Bellur
parent
288040196c
commit
993edcc972
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: glusterfsd
|
||||
# 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 server
|
||||
# Description: This file starts / stops the gluster server
|
||||
# Short-Description: Gluster File System service for volume management
|
||||
# Description: Gluster File System service for volume management
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Chris AtLee <chris@atlee.ca>
|
||||
# Patched by: Matthias Albert < matthias@linux4experts.de>
|
||||
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
NAME=glusterfsd
|
||||
NAME=glusterd
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
DAEMON=@prefix@/sbin/$NAME
|
||||
PIDFILE=/var/run/$NAME.pid
|
||||
CONFIGFILE=/etc/glusterfs/glusterfsd.vol
|
||||
GLUSTERFS_OPTS="-f $CONFIGFILE"
|
||||
GLUSTERD_OPTS=""
|
||||
PID=`test -f $PIDFILE && cat $PIDFILE`
|
||||
|
||||
|
||||
@ -45,10 +44,10 @@ do_start()
|
||||
pidofproc -p $PIDFILE $DAEMON >/dev/null
|
||||
status=$?
|
||||
if [ $status -eq 0 ]; then
|
||||
log_success_msg "glusterfs server is already running with pid $PID"
|
||||
log_success_msg "glusterd service 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_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 $?
|
||||
@ -57,7 +56,7 @@ do_start()
|
||||
|
||||
do_stop()
|
||||
{
|
||||
log_daemon_msg "Stopping glusterfs server" "glusterfsd"
|
||||
log_daemon_msg "Stopping glusterd service" "glusterd"
|
||||
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
|
||||
log_end_msg $?
|
||||
rm -f $PIDFILE
|
||||
@ -70,9 +69,9 @@ do_status()
|
||||
pidofproc -p $PIDFILE $DAEMON >/dev/null
|
||||
status=$?
|
||||
if [ $status -eq 0 ]; then
|
||||
log_success_msg "glusterfs server is running with pid $PID"
|
||||
log_success_msg "glusterd service is running with pid $PID"
|
||||
else
|
||||
log_failure_msg "glusterfs server is not running."
|
||||
log_failure_msg "glusterd service is not running."
|
||||
fi
|
||||
exit $status
|
||||
}
|
||||
@ -1,24 +1,23 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# chkconfig: 35 90 12
|
||||
# description: Glusterfsd server
|
||||
# description: Gluster File System service for volume management
|
||||
#
|
||||
|
||||
# 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"
|
||||
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 $GSERVER
|
||||
daemon $GLUSTERD
|
||||
RETVAL=$?
|
||||
[ $RETVAL -ne 0 ] && exit $RETVAL
|
||||
}
|
||||
@ -27,7 +26,7 @@ start()
|
||||
stop()
|
||||
{
|
||||
echo $"Stopping $BASE:"
|
||||
killproc $BASE
|
||||
killproc $BASE
|
||||
}
|
||||
|
||||
|
||||
@ -1,31 +1,30 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: glusterfsd
|
||||
# Provides: glusterd
|
||||
# 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
|
||||
# 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=glusterfsd
|
||||
GLUSTERFSD_BIN=@prefix@/sbin/$BASE
|
||||
CONFIGFILE=/etc/glusterfs/glusterfsd.vol
|
||||
GLUSTERFSD_OPTS="-f $CONFIGFILE"
|
||||
GSERVER="$GLUSTERFSD_BIN $GLUSTERFSD_OPTS"
|
||||
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 $GSERVER
|
||||
startproc $GLUSTERD
|
||||
return $?
|
||||
}
|
||||
|
||||
@ -33,7 +32,7 @@ start()
|
||||
stop()
|
||||
{
|
||||
echo $"Stopping $BASE:"
|
||||
killproc $BASE
|
||||
killproc $BASE
|
||||
return $?
|
||||
}
|
||||
|
||||
@ -55,7 +54,7 @@ case $1 in
|
||||
rc_status -v
|
||||
;;
|
||||
status)
|
||||
echo -n " glusterfsd"
|
||||
echo -n " glusterd"
|
||||
if ! checkproc $BASE ;then
|
||||
echo " not running"
|
||||
rc_failed 3
|
||||
@ -3,13 +3,11 @@
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>com.gluster.glusterfs</string>
|
||||
<string>com.gluster.glusterd</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>@prefix@/sbin/glusterfsd</string>
|
||||
<string>@prefix@/sbin/glusterd</string>
|
||||
<string>-N</string>
|
||||
<string>-f</string>
|
||||
<string>@prefix@/etc/glusterfs/server.vol</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user