Attachment 6096 Details for Bug 30089 – Патч для glusterfs3 3.4.3

[patch] Патч для glusterfs3 3.4.3

Removing_glusterfsd.patch (text/plain), 7.61 KB, created by anton on 2014-05-22 20:15:52 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: anton

Created: 2014-05-22 20:15:52 MSK

Size: 7.61 KB

patch

obsolete

>From 44d39c5c514d1fac476a7a1d8584160e1c79c780 Mon Sep 17 00:00:00 2001
>From: Anton Agapov <anton@etersoft.ru>
>Date: Thu, 22 May 2014 19:28:10 +0400
>Subject: [PATCH] Removing glusterfsd as SystemV service, cleaning the paths
>
>---
> glusterd.init      | 146 ++++++++++++++++++++++++++++-------------------------
> glusterd.sysconfig |   5 +-
> glusterfs3.spec    |  23 ++-------
> 3 files changed, 84 insertions(+), 90 deletions(-)
>
>diff --git a/glusterd.init b/glusterd.init
>index 5af8909..eea107d 100644
>--- a/glusterd.init
>+++ b/glusterd.init
>@@ -1,27 +1,31 @@
> #!/bin/sh
> #
>-# glusterd   Startup script for the glusterfs server
>-#
>-# chkconfig:   - 20 80
>-# description: Clustered file-system server
>+# glusterd	gluster server.
>+# 
>+# chkconfig: - 80 20
>+# description: 	This file starts / stops the gluster server
>+# processname:  glusterd
>+# config: /etc/glusterfs/gluster.vol
>+# pidfile: /var/run/glusterd.pid
> 
> ### BEGIN INIT INFO
> # Provides: glusterd
> # Required-Start: $local_fs $network
> # Required-Stop: $local_fs $network
>-# Should-Start: 
>-# Should-Stop: 
>-# Default-Start: 
>+# Should-Start:
>+# Should-Stop:
>+# Default-Start:
> # Default-Stop: 0 1 2 3 4 5 6
> # Short-Description: glusterfs server
> # Description:       Clustered file-system server
> ### END INIT INFO
> 
>+# Do not load RH compatibility interface.
>+WITHOUT_RC_COMPAT=1
>+
> # Source function library.
>-. /etc/rc.d/init.d/functions
>+. /etc/init.d/functions
> 
>-# Set defaults, then source config for eventual overrides
>-GLUSTERFSD_NOFILE="65536"
> 
> NAME=glusterd
> SCRIPTNAME=/etc/init.d/$NAME
>@@ -29,75 +33,77 @@ DAEMON=/usr/sbin/$NAME
> PIDFILE=/var/run/$NAME.pid
> LOCKFILE=/var/lock/subsys/$NAME
> SourceIfNotEmpty /etc/sysconfig/$NAME
>-GLUSTERFSD_OPTS="-l $GLUSTERFSD_LOGFILE -L $GLUSTERFSD_LOGLEVEL -p $PIDFILE"
>+GLUSTERFSD_OPTS="-f $GLUSTERFSD_CONFIG -l $GLUSTERFSD_LOGFILE -L $GLUSTERFSD_LOGLEVEL -p $PIDFILE"
> RETVAL=0
> 
>-start() {
>-    [ -x $exec ] || exit 5
>-    [ -f $GLUSTERD_CONFIG ] || exit 6
>-    ulimit -n $GLUSTERFSD_NOFILE
>-    start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $DAEMON $GLUSTERFSD_OPTS
>-    RETVAL=$?
>-    return $RETVAL
>-}
>-
>-stop() {
>-    stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $NAME
>-    RETVAL=$?
>-    return $RETVAL
>-}
> 
>-restart() {
>-    stop
>-    start
>+start()
>+{
>+      [ -x $exec ] || exit 5
>+      ulimit -n $GLUSTERFSD_NOFILE
>+      start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $DAEMON $GLUSTERFSD_OPTS
>+      RETVAL=$?
>+      return $RETVAL
> }
> 
>-reload() {
>-    msg_reloading $NAME
>-    stop_daemon --pidfile "$PIDFILE" --expect-user root -HUP -- $NAME
>-    RETVAL=$?
>-    return $RETVAL
>+stop()
>+{
>+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $NAME
>+	RETVAL=$?
>+	return $RETVAL
> }
> 
>-force_reload() {
>-    restart
>-}
>-
>-rh_status() {
>-    status --pidfile "$PIDFILE" --expect-user root -- $NAME
>-    RETVAL=$?
>-}
>-
>-rh_status_q() {
>-    rh_status &>/dev/null
>+restart()
>+{
>+	stop
>+	start
> }
> 
>+reload()
>+{
>+	msg_reloading $NAME
>+	stop_daemon --pidfile "$PIDFILE" --expect-user root -HUP -- $NAME
>+	RETVAL=$?
>+	return $RETVAL
>+} 
> 
>+# See how we were called.
> case "$1" in
>-    start)
>-        start
>-        ;;
>-    stop)
>-        stop
>-        ;;
>-    restart)
>-        restart
>-        ;;
>-    reload)
>-        reload
>-        ;;
>-    force-reload)
>-        force_reload
>-        ;;
>-    status)
>-        rh_status
>-        ;;
>-    condrestart|try-restart)
>-        rh_status_q || exit 0
>-        restart
>-        ;;
>-    *)
>-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
>-        exit 2
>+	start)
>+		start
>+		;;
>+	stop)
>+		stop
>+		;;
>+	reload|force-reload)
>+		reload
>+		;;
>+	restart)
>+		restart
>+		;;
>+	condstop)
>+		if [ -e "$LOCKFILE" ]; then
>+			stop
>+		fi
>+		;;
>+	condrestart|try-restart)
>+		if [ -e "$LOCKFILE" ]; then
>+			restart
>+		fi
>+		;;
>+	condreload)
>+		if [ -e "$LOCKFILE" ]; then
>+			reload
>+		fi
>+		;;
>+	status)
>+		status --pidfile "$PIDFILE" --expect-user root -- $NAME
>+		RETVAL=$?
>+		;;
>+	*)
>+		msg_usage "${0##*/} {start|stop|reload|restart|condstop|condrestart|condreload|status}"
>+		RETVAL=1
> esac
>-exit $?
>+
>+exit $RETVAL
>+
>diff --git a/glusterd.sysconfig b/glusterd.sysconfig
>index 79823cc..0e047a3 100644
>--- a/glusterd.sysconfig
>+++ b/glusterd.sysconfig
>@@ -1,8 +1,9 @@
> # Change the glusterd service defaults here.
> # See "glusterd --help" outpout for defaults and possible values.
> 
>-#GLUSTERFSD_CONFIG="/etc/gluster/glusterd.vol"
>-GLUSTERFSD_LOGFILE="/var/log/gluster/gluster.log"
>+GLUSTERFSD_CONFIG="/etc/glusterfs/glusterd.vol"
>+GLUSTERFSD_LOGFILE="/var/log/glusterfs/gluster.log"
> GLUSTERFSD_LOGLEVEL="ERROR"
> GLUSTERFSD_NOFILE="65536"
> 
>+
>diff --git a/glusterfs3.spec b/glusterfs3.spec
>index a4954a3..7fbc1a6 100644
>--- a/glusterfs3.spec
>+++ b/glusterfs3.spec
>@@ -28,20 +28,20 @@ Packager: Alexei Takaseev <taf@altlinux.ru>
> 
> Source0: %name-%version.tar
> Source1: glusterd.sysconfig
>-Source2: glusterfsd.sysconfig
>+
> Source3: umount.glusterfs
> Source4: glusterfs-fuse.logrotate
> Source5: glusterd.logrotate
> Source6: glusterfsd.logrotate
> 
> Source7: glusterd.init
>-Source8: glusterfsd.init
>+
> 
> Patch0: %name-%version-%release.patch
> 
> %define _init_install() install -D -p -m 0755 %1 %buildroot%_initdir/%2 ;
> %define _init_file1     %_initdir/glusterd
>-%define _init_file2     %_initdir/glusterfsd
>+#%define _init_file2     %_initdir/glusterfsd
> 
> # Automatically added by buildreq on Mon Nov 19 2012
> BuildRequires: flex glibc-devel-static libibverbs-devel libreadline-devel libssl-devel libxml2-devel python-module-mwlib
>@@ -212,10 +212,7 @@ install -p -m 0644 xlators/protocol/server/src/*.h \
> rm -f %buildroot/etc/init.d/glusterd
> 
> # Create logging directory
>-mkdir -p %buildroot%_logdir/gluster
>-mkdir -p %buildroot%_logdir/gluster/glusterd
>-mkdir -p %buildroot%_logdir/gluster/glusterfs
>-mkdir -p %buildroot%_logdir/gluster/glusterfsd
>+mkdir -p %buildroot%_logdir/glusterfs/
> 
> # Remove unwanted files from all the shared libraries
> find %buildroot%_libdir -name '*.a' -delete
>@@ -243,11 +240,8 @@ rm -f examples/Makefile*
> 
> # Install init script and sysconfig file
> %_init_install %SOURCE7 glusterd
>-%_init_install %SOURCE8 glusterfsd
> install -D -p -m 0644 %SOURCE1 \
> %buildroot%_sysconfdir/sysconfig/glusterd
>-install -D -p -m 0644 %SOURCE2 \
>-%buildroot%_sysconfdir/sysconfig/glusterfsd
> # Install wrapper umount script
> install -D -p -m 0755 %SOURCE3 \
> %buildroot/sbin/umount.glusterfs
>@@ -266,9 +260,6 @@ install -D -p -m 644 extras/glusterfs.vim \
> 
> %files
> %doc ChangeLog INSTALL README THANKS COPYING-GPLV2 COPYING-LGPLV3
>-#%config(noreplace) %_sysconfdir/logrotate.d/glusterd
>-#%config(noreplace) %_sysconfdir/sysconfig/glusterd
>-#%_libdir/glusterfs
> %_libdir/*.so.*
> %_sbindir/glusterfs*
> %_sbindir/gluster
>@@ -279,7 +270,7 @@ install -D -p -m 644 extras/glusterfs.vim \
> %_libdir/glusterfs/%version/auth/
> %_libdir/glusterfs/%version/xlator/
> %exclude %_libdir/glusterfs/%version/xlator/mount/fuse*
>-%_logdir/gluster/*
>+%_logdir/glusterfs
> %_man8dir/*gluster*.8*
> %exclude %_man8dir/mount.glusterfs.8*
> %if 0%{!?_without_rdma:1}
>@@ -316,10 +307,8 @@ install -D -p -m 644 extras/glusterfs.vim \
> %config(noreplace) %_sysconfdir/glusterfs
> # Legacy configs
> %config(noreplace) %_sysconfdir/logrotate.d/glusterfsd
>-%config(noreplace) %_sysconfdir/sysconfig/glusterfsd
> %_sharedstatedir/glusterd
> %_init_file1
>-%_init_file2
> 
> %files vim
> %doc COPYING-GPLV2 COPYING-LGPLV3
>@@ -332,11 +321,9 @@ install -D -p -m 644 extras/glusterfs.vim \
> %_libdir/pkgconfig/glusterfs-api.pc
> 
> %post server
>-%post_service glusterfsd
> %post_service glusterd
> 
> %preun server
>-%preun_service glusterfsd
> %preun_service glusterd
> 
> %changelog
>-- 
>1.8.5.5
>

Actions: View | Diff

Attachments on bug 30089: 6096