View | Details | Raw Unified | Return to bug 30089
Collapse All | Expand All

(-)a/glusterd.init (-70 / +76 lines)
Lines 1-27 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
#
2
#
3
# glusterd   Startup script for the glusterfs server
3
# glusterd	gluster server.
4
#
4
# 
5
# chkconfig:   - 20 80
5
# chkconfig: - 80 20
6
# description: Clustered file-system server
6
# description: 	This file starts / stops the gluster server
7
# processname:  glusterd
8
# config: /etc/glusterfs/gluster.vol
9
# pidfile: /var/run/glusterd.pid
7
10
8
### BEGIN INIT INFO
11
### BEGIN INIT INFO
9
# Provides: glusterd
12
# Provides: glusterd
10
# Required-Start: $local_fs $network
13
# Required-Start: $local_fs $network
11
# Required-Stop: $local_fs $network
14
# Required-Stop: $local_fs $network
12
# Should-Start: 
15
# Should-Start:
13
# Should-Stop: 
16
# Should-Stop:
14
# Default-Start: 
17
# Default-Start:
15
# Default-Stop: 0 1 2 3 4 5 6
18
# Default-Stop: 0 1 2 3 4 5 6
16
# Short-Description: glusterfs server
19
# Short-Description: glusterfs server
17
# Description:       Clustered file-system server
20
# Description:       Clustered file-system server
18
### END INIT INFO
21
### END INIT INFO
19
22
23
# Do not load RH compatibility interface.
24
WITHOUT_RC_COMPAT=1
25
20
# Source function library.
26
# Source function library.
21
. /etc/rc.d/init.d/functions
27
. /etc/init.d/functions
22
28
23
# Set defaults, then source config for eventual overrides
24
GLUSTERFSD_NOFILE="65536"
25
29
26
NAME=glusterd
30
NAME=glusterd
27
SCRIPTNAME=/etc/init.d/$NAME
31
SCRIPTNAME=/etc/init.d/$NAME
Lines 29-103 DAEMON=/usr/sbin/$NAME Link Here
29
PIDFILE=/var/run/$NAME.pid
33
PIDFILE=/var/run/$NAME.pid
30
LOCKFILE=/var/lock/subsys/$NAME
34
LOCKFILE=/var/lock/subsys/$NAME
31
SourceIfNotEmpty /etc/sysconfig/$NAME
35
SourceIfNotEmpty /etc/sysconfig/$NAME
32
GLUSTERFSD_OPTS="-l $GLUSTERFSD_LOGFILE -L $GLUSTERFSD_LOGLEVEL -p $PIDFILE"
36
GLUSTERFSD_OPTS="-f $GLUSTERFSD_CONFIG -l $GLUSTERFSD_LOGFILE -L $GLUSTERFSD_LOGLEVEL -p $PIDFILE"
33
RETVAL=0
37
RETVAL=0
34
38
35
start() {
36
    [ -x $exec ] || exit 5
37
    [ -f $GLUSTERD_CONFIG ] || exit 6
38
    ulimit -n $GLUSTERFSD_NOFILE
39
    start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $DAEMON $GLUSTERFSD_OPTS
40
    RETVAL=$?
41
    return $RETVAL
42
}
43
44
stop() {
45
    stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $NAME
46
    RETVAL=$?
47
    return $RETVAL
48
}
49
39
50
restart() {
40
start()
51
    stop
41
{
52
    start
42
      [ -x $exec ] || exit 5
43
      ulimit -n $GLUSTERFSD_NOFILE
44
      start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $DAEMON $GLUSTERFSD_OPTS
45
      RETVAL=$?
46
      return $RETVAL
53
}
47
}
54
48
55
reload() {
49
stop()
56
    msg_reloading $NAME
50
{
57
    stop_daemon --pidfile "$PIDFILE" --expect-user root -HUP -- $NAME
51
	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- $NAME
58
    RETVAL=$?
52
	RETVAL=$?
59
    return $RETVAL
53
	return $RETVAL
60
}
54
}
61
55
62
force_reload() {
56
restart()
63
    restart
57
{
64
}
58
	stop
65
59
	start
66
rh_status() {
67
    status --pidfile "$PIDFILE" --expect-user root -- $NAME
68
    RETVAL=$?
69
}
70
71
rh_status_q() {
72
    rh_status &>/dev/null
73
}
60
}
74
61
62
reload()
63
{
64
	msg_reloading $NAME
65
	stop_daemon --pidfile "$PIDFILE" --expect-user root -HUP -- $NAME
66
	RETVAL=$?
67
	return $RETVAL
68
} 
75
69
70
# See how we were called.
76
case "$1" in
71
case "$1" in
77
    start)
72
	start)
78
        start
73
		start
79
        ;;
74
		;;
80
    stop)
75
	stop)
81
        stop
76
		stop
82
        ;;
77
		;;
83
    restart)
78
	reload|force-reload)
84
        restart
79
		reload
85
        ;;
80
		;;
86
    reload)
81
	restart)
87
        reload
82
		restart
88
        ;;
83
		;;
89
    force-reload)
84
	condstop)
90
        force_reload
85
		if [ -e "$LOCKFILE" ]; then
91
        ;;
86
			stop
92
    status)
87
		fi
93
        rh_status
88
		;;
94
        ;;
89
	condrestart|try-restart)
95
    condrestart|try-restart)
90
		if [ -e "$LOCKFILE" ]; then
96
        rh_status_q || exit 0
91
			restart
97
        restart
92
		fi
98
        ;;
93
		;;
99
    *)
94
	condreload)
100
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
95
		if [ -e "$LOCKFILE" ]; then
101
        exit 2
96
			reload
97
		fi
98
		;;
99
	status)
100
		status --pidfile "$PIDFILE" --expect-user root -- $NAME
101
		RETVAL=$?
102
		;;
103
	*)
104
		msg_usage "${0##*/} {start|stop|reload|restart|condstop|condrestart|condreload|status}"
105
		RETVAL=1
102
esac
106
esac
103
exit $?
107
108
exit $RETVAL
109
(-)a/glusterd.sysconfig (-2 / +3 lines)
Lines 1-8 Link Here
1
# Change the glusterd service defaults here.
1
# Change the glusterd service defaults here.
2
# See "glusterd --help" outpout for defaults and possible values.
2
# See "glusterd --help" outpout for defaults and possible values.
3
3
4
#GLUSTERFSD_CONFIG="/etc/gluster/glusterd.vol"
4
GLUSTERFSD_CONFIG="/etc/glusterfs/glusterd.vol"
5
GLUSTERFSD_LOGFILE="/var/log/gluster/gluster.log"
5
GLUSTERFSD_LOGFILE="/var/log/glusterfs/gluster.log"
6
GLUSTERFSD_LOGLEVEL="ERROR"
6
GLUSTERFSD_LOGLEVEL="ERROR"
7
GLUSTERFSD_NOFILE="65536"
7
GLUSTERFSD_NOFILE="65536"
8
8
9
(-)a/glusterfs3.spec (-19 / +5 lines)
Lines 28-47 Packager: Alexei Takaseev <taf@altlinux.ru> Link Here
28
28
29
Source0: %name-%version.tar
29
Source0: %name-%version.tar
30
Source1: glusterd.sysconfig
30
Source1: glusterd.sysconfig
31
Source2: glusterfsd.sysconfig
31
32
Source3: umount.glusterfs
32
Source3: umount.glusterfs
33
Source4: glusterfs-fuse.logrotate
33
Source4: glusterfs-fuse.logrotate
34
Source5: glusterd.logrotate
34
Source5: glusterd.logrotate
35
Source6: glusterfsd.logrotate
35
Source6: glusterfsd.logrotate
36
36
37
Source7: glusterd.init
37
Source7: glusterd.init
38
Source8: glusterfsd.init
38
39
39
40
Patch0: %name-%version-%release.patch
40
Patch0: %name-%version-%release.patch
41
41
42
%define _init_install() install -D -p -m 0755 %1 %buildroot%_initdir/%2 ;
42
%define _init_install() install -D -p -m 0755 %1 %buildroot%_initdir/%2 ;
43
%define _init_file1     %_initdir/glusterd
43
%define _init_file1     %_initdir/glusterd
44
%define _init_file2     %_initdir/glusterfsd
44
#%define _init_file2     %_initdir/glusterfsd
45
45
46
# Automatically added by buildreq on Mon Nov 19 2012
46
# Automatically added by buildreq on Mon Nov 19 2012
47
BuildRequires: flex glibc-devel-static libibverbs-devel libreadline-devel libssl-devel libxml2-devel python-module-mwlib
47
BuildRequires: flex glibc-devel-static libibverbs-devel libreadline-devel libssl-devel libxml2-devel python-module-mwlib
Lines 212-221 install -p -m 0644 xlators/protocol/server/src/*.h \ Link Here
212
rm -f %buildroot/etc/init.d/glusterd
212
rm -f %buildroot/etc/init.d/glusterd
213
213
214
# Create logging directory
214
# Create logging directory
215
mkdir -p %buildroot%_logdir/gluster
215
mkdir -p %buildroot%_logdir/glusterfs/
216
mkdir -p %buildroot%_logdir/gluster/glusterd
217
mkdir -p %buildroot%_logdir/gluster/glusterfs
218
mkdir -p %buildroot%_logdir/gluster/glusterfsd
219
216
220
# Remove unwanted files from all the shared libraries
217
# Remove unwanted files from all the shared libraries
221
find %buildroot%_libdir -name '*.a' -delete
218
find %buildroot%_libdir -name '*.a' -delete
Lines 243-253 rm -f examples/Makefile* Link Here
243
240
244
# Install init script and sysconfig file
241
# Install init script and sysconfig file
245
%_init_install %SOURCE7 glusterd
242
%_init_install %SOURCE7 glusterd
246
%_init_install %SOURCE8 glusterfsd
247
install -D -p -m 0644 %SOURCE1 \
243
install -D -p -m 0644 %SOURCE1 \
248
%buildroot%_sysconfdir/sysconfig/glusterd
244
%buildroot%_sysconfdir/sysconfig/glusterd
249
install -D -p -m 0644 %SOURCE2 \
250
%buildroot%_sysconfdir/sysconfig/glusterfsd
251
# Install wrapper umount script
245
# Install wrapper umount script
252
install -D -p -m 0755 %SOURCE3 \
246
install -D -p -m 0755 %SOURCE3 \
253
%buildroot/sbin/umount.glusterfs
247
%buildroot/sbin/umount.glusterfs
Lines 266-274 install -D -p -m 644 extras/glusterfs.vim \ Link Here
266
260
267
%files
261
%files
268
%doc ChangeLog INSTALL README THANKS COPYING-GPLV2 COPYING-LGPLV3
262
%doc ChangeLog INSTALL README THANKS COPYING-GPLV2 COPYING-LGPLV3
269
#%config(noreplace) %_sysconfdir/logrotate.d/glusterd
270
#%config(noreplace) %_sysconfdir/sysconfig/glusterd
271
#%_libdir/glusterfs
272
%_libdir/*.so.*
263
%_libdir/*.so.*
273
%_sbindir/glusterfs*
264
%_sbindir/glusterfs*
274
%_sbindir/gluster
265
%_sbindir/gluster
Lines 279-285 install -D -p -m 644 extras/glusterfs.vim \ Link Here
279
%_libdir/glusterfs/%version/auth/
270
%_libdir/glusterfs/%version/auth/
280
%_libdir/glusterfs/%version/xlator/
271
%_libdir/glusterfs/%version/xlator/
281
%exclude %_libdir/glusterfs/%version/xlator/mount/fuse*
272
%exclude %_libdir/glusterfs/%version/xlator/mount/fuse*
282
%_logdir/gluster/*
273
%_logdir/glusterfs
283
%_man8dir/*gluster*.8*
274
%_man8dir/*gluster*.8*
284
%exclude %_man8dir/mount.glusterfs.8*
275
%exclude %_man8dir/mount.glusterfs.8*
285
%if 0%{!?_without_rdma:1}
276
%if 0%{!?_without_rdma:1}
Lines 316-325 install -D -p -m 644 extras/glusterfs.vim \ Link Here
316
%config(noreplace) %_sysconfdir/glusterfs
307
%config(noreplace) %_sysconfdir/glusterfs
317
# Legacy configs
308
# Legacy configs
318
%config(noreplace) %_sysconfdir/logrotate.d/glusterfsd
309
%config(noreplace) %_sysconfdir/logrotate.d/glusterfsd
319
%config(noreplace) %_sysconfdir/sysconfig/glusterfsd
320
%_sharedstatedir/glusterd
310
%_sharedstatedir/glusterd
321
%_init_file1
311
%_init_file1
322
%_init_file2
323
312
324
%files vim
313
%files vim
325
%doc COPYING-GPLV2 COPYING-LGPLV3
314
%doc COPYING-GPLV2 COPYING-LGPLV3
Lines 332-342 install -D -p -m 644 extras/glusterfs.vim \ Link Here
332
%_libdir/pkgconfig/glusterfs-api.pc
321
%_libdir/pkgconfig/glusterfs-api.pc
333
322
334
%post server
323
%post server
335
%post_service glusterfsd
336
%post_service glusterd
324
%post_service glusterd
337
325
338
%preun server
326
%preun server
339
%preun_service glusterfsd
340
%preun_service glusterd
327
%preun_service glusterd
341
328
342
%changelog
329
%changelog
343
- 

Return to bug 30089