Commit Graph

32 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY
f7b1245ca2 build: sync glusterfs.spec.in with Fedora glusterfs.spec
* add glusterfs-api and glusterfs-api-devel sub-packages
 * add extras/systemd/glusterd.service. Use it (or extras/init.d/glusterd)
   instead of the Fedora versions.
 * restores ability to build glusterfs RPMs from the dist tarball with
   'rpmbuild {-ts,-tb,-ta} glusterfs-XXX.tar.gz'
 * other minor cleanups mostly to sync with fedora .spec and to build
   from the dist tarball. Any differences will be resolved in the fedora
   .spec in the next release (i.e. beta4 or GA).

(still considering whether to add fedora glusterfsd.{init,service} files
to glusterfs or remove them from fedora.)

BUG: 950083
Change-Id: Ibda3cd57b24ef5c2a27446703e718e5044ec546c
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/5230
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Bala FA <barumuga@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
2013-06-26 04:36:47 -07:00
Niels de Vos
689618e2fc extras: prevent "glusterd dead but subsys locked"
Commit b5bf14a6 added support for a file under /var/lock/subsys,
Hoewever, killproc does remove the $PIDFILE which cases subsequent
checks on its existence to fail. When glusterd was stopped successfully,
the $PIDFILE has been removed already, there is no need to try to remove
is again.

Upon executing '/sbin/service glusterd status', the message 'glusterd
dead but subsys locked' would be returned because the file under
/var/lock/subsys was not removed.

Bug: 960476
Change-Id: I781fe463e3c5472e42d668155cee4f63d349a568
Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/5074
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
2013-05-25 11:41:29 -07:00
Niels de Vos
323fe9ec80 rpm: automatically load the fuse module on EL5
The fuse module needs to be loaded before /dev/fuse can be used. On
RHEL6 and Fedora the module is loaded on demand. RHEL5 needs to load the
module manually.

This change add a script under /etc/sysconfig/modules/ that loads the
fuse module on boot and packages it in the EL5 version of
glusterfs-fuse.

One of the features of GlusterFS is to not depend on additional fuse
userspace. The conditional requires on /usr/bin/fusermount is not
needed, this command is never called in the current version (even though
is it referenced in the sources).

Change-Id: I77028dade54771cb49cea68a517100f73763dc85
BUG: 947830
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/5070
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
2013-05-22 12:20:46 -07:00
Niels de Vos
b5bf14a6ab extras: /etc/init.d/glusterd should create a lockfile under /var/lock/sybsys
Without a lockfile under /var/lock/subsys, the glusterd service is not
stopped on shutdown or reboot.

Change-Id: I9dc9b4204c5c39879c22191b2e8a2b81a4f3a58a
BUG: 960476
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/4960
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
2013-05-07 11:44:29 -07:00
Niels de Vos
ee9984882e extras: include Fedora changes in init.d/glusterd
The changes in the .spec file from Fedora have largely been merged into
the glusterfs.spec.in. It seems that some dependencies have been missed,
most importantly some additions to the init-script that are called while
(un)installing or updating RPMs.

These changes come from the downstream Fedora package that carries its
own glusterd.init script. In future, Fedora/EPEL should be able to drop
that file and use the Gluster project version.

Change-Id: Iac25854b0c559b93fa1dd452a04663bd95ea3378
BUG: 954149
URL: http://lists.nongnu.org/archive/html/gluster-devel/2013-04/msg00077.html
CC: Fedora GlusterFS Packagers <glusterfs-owner@fedoraproject.org>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/4864
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
2013-04-29 17:07:26 -07:00
Raghavendra Talur
ee05db0b1e extras: Don't update RETVAL with invalid value.
Problem:
Start and restart functions update the value of RETVAL internally.
Assigning $? to RETVAL after function return was updating RETVAL with
invalid value.

Fix:
Removed assignment statement after start and restart functions return.

Stop function was always returning 0 as return value due to one extra echo
command. Removed echo line.

Change-Id: Iec1a83a83463f419dd45e12daf4e5ded80568a3a
BUG: 888442
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-on: http://review.gluster.org/4349
Reviewed-by: Anand Avati <avati@redhat.com>
Tested-by: Anand Avati <avati@redhat.com>
2013-01-18 17:36:46 -08:00
Raghavendra Talur
fd32c05f46 extras: Changed the exit status in start function to 0.
Problem:
We were returning "1" when "glusterd start" was being called with service
already running. As per
http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
we should consider it to be a success case and return 0.

Fix:
Just changed the return status from 1 to 0.

Change-Id: I8d6d2014f0c32ba53834503e721e2a71df7330a8
BUG: 845653
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-on: http://review.gluster.org/4348
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
2013-01-11 09:12:38 -08:00
Filip Pytloun
6d58cb0476 RHEL init script: ability to overwrite options from sysconfig
Change-Id: I15df0aef73e097a9ccfb00e2d4cae81d3a5a82fc
BUG: 885739
Signed-off-by: Filip Pytloun <filip.pytloun@gooddata.com>
Reviewed-on: http://review.gluster.org/4290
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Niels de Vos <ndevos@redhat.com>
2012-12-12 07:36:26 -08:00
Jeff Darcy
4efddca755 init.d: implement reload action for SUSE init script
Change-Id: Ic17832b5bb33bc43faa1ff81c5221ec4e3f9294d
BUG: 862082
Original-author: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/4012
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
2012-10-01 16:46:21 -07:00
Jeff Darcy
76e4895a87 init.d: use proper dependencies in SUSE init script
"/usr", the place where the binaries usually reside, requires
$remote_fs.

Change-Id: I830c45b09b78b6c3b36c1475ac3f13cf6c2df588
BUG: 862082
Original-author: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/4011
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
2012-10-01 16:45:55 -07:00
Thomas Oulevey
4b4e9a058f init.d: Fix init.d on Redhat, so it does not always return 0.
* Installing gluster with puppet, it gives an error if service "hasstatus => true" is used.
* Introduced a $RETVAL variable set to previous command return value.

Change-Id: I186ec59f892f04f25c06478315ca85183cb6232a
BUG: 836007
Signed-off-by: Thomas Oulevey <thomas.oulevey@cern.ch>
Reviewed-on: http://review.gluster.org/3847
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
2012-08-28 02:58:17 -07:00
Amar Tumballi
63a9bbb2a8 init.d: stop only 'glusterd' process on '/etc/init.d/glusterd stop'
earlier it used to stop even brick processes and gluster NFS server
process, which is not a expected behavior for command
'/etc/init.d/glusterd stop'

Change-Id: Ibc092cdf2693b3b2ae491d32ce3f0113854149c8
Signed-off-by: Amar Tumballi <amarts@redhat.com>
BUG: 796998
Reviewed-on: http://review.gluster.com/2919
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
2012-05-18 18:42:15 -07:00
Kaushik BV
9636f5b16c extras: create PID file for glusterd when started from init scripts
thanks to Jaroslav Pulchart (jaroslav.pulchart@centrum.cz) for the patch

Change-Id: Id07bf50536c8638f790f06e6e5994f85555c3978
BUG: 771221
Signed-off-by: Kaushik BV <kbudiger@redhat.com>
Reviewed-on: http://review.gluster.com/2668
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
2012-02-03 08:16:16 -08:00
Sachidananda Urs
5aed416a5f Change the start/stop order of glusterd script at boot time.
In cases of client and server sharing the same machine, mounting GlusterFS at
boot time failed due to the start and stop order we use for glusterd. And people
had to resort to the idea of adding mount command in rc.local.

Currently the start and stop order at the boot time were 90 and 12, and netfs
started before `glusterd' and failed to mount GlusterFS. By changing
the rc order to 20 80 glusterd is started earlier than netfs, thus enabling
netfs to mount GlusterFS during boot process.

Thanks to: alex@net13.info for the suggestion in bug 2484.

Change-Id: I482f4dac5e5dd8bc5b8f5034c394f5dbe6c1fd3e
BUG: 2484
Reviewed-on: http://review.gluster.com/746
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <fharshav@redhat.com>
Tested-by: Harshavardhana <fharshav@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@gluster.com>
2011-11-23 20:50:47 -08:00
Lakshmipathi
29397bda24 build : use pid file to kill nfs process
Signed-off-by: Lakshmipathi.G <lakshmipathi@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 2969 (add --pidfile option)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2969
2011-06-08 11:17:29 -07:00
Lakshmipathi G
7b07d444a7 install gluster binaries under /opt/glusterfs/version with sym.link at /usr/bin
Signed-off-by: Lakshmipathi G <lakshmipathi@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 2279 (rpm spec file changes)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2279
2011-02-22 09:35:01 -08:00
Vijay Bellur
2ec661c072 extras: Do not check_config() for glusterd in Debian init
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
2010-10-26 03:01:41 -07:00
Harshavardhana
372ed08f25 init.d: Path not resolved during compilation to actual prefix
Signed-off-by: Harshavardhana <harsha@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1810 (qa 40 glusterd path is hardcoded, won't start by default.)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1810
2010-10-05 02:48:09 -07:00
Amar Tumballi
63281f6989 /etc/init.d/glusterd (for RPM based distros), fix output format
Thanks to Bernard Li <bernard@vanhpc.org> for the patch

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1677 (Fix output formatting for Red Hat init script)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1677
2010-10-04 07:05:43 -07:00
Balamurugan Arumugam
993edcc972 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
2010-09-13 03:05:46 -07:00
Csaba Henk
5e03484d1d OS X: make location of launchd service configurable
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 361 (GlusterFS 3.0 should work on Mac OS/X)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=361
2010-05-31 05:39:22 -07:00
Paul Rawson
83598e6015 Fix Redhat init file so that it knows the correct binary location
Signed-off-by: Paul Rawson <plrca2@gmail.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 388 (Redhat initfile fix)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=388
2009-11-19 03:23:19 -08:00
Anand V. Avati
5674c41b3e extras/init.d: make install directory configurable with --with-initdir 2009-10-27 05:52:16 -07:00
Vijay Bellur
0b1197defa Changed occurrences of Z Research to Gluster.
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
2009-10-07 03:54:49 -07:00
Harshavardhana
f5d0e815b4 Remove absolute path for init scripts.
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
2009-05-29 02:28:26 -07:00
Harshavardhana
ce653eadc2 modified init scripts to honour @prefix@
fixes http://savannah.nongnu.org/bugs/?26581

Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
2009-05-16 15:32:44 +05:30
Harshavardhana
6bd53940d1 Renamed abs_top_srcdir to top_srcdir for older versions of autotool
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
2009-04-17 13:45:18 +05:30
Harshavardhana
d170334473 Fixed the build problems observed
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
2009-04-16 14:54:21 +05:30
Harshavardhana
ae378b63c0 Fixed build problems for init script installation.
Fixed build problem for init scripts (Reported by Krishna and Vikas).

Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
2009-03-09 17:45:56 +05:30
Harshavardhana
da71d1359c Added proper handling for the init scripts for (Debian, Ubuntu, SuSE, Redhat), SuSE init script also added.
* Init scripts added for Debian, Redhat, SuSE distribution, each are installed
  by checking each distribution specific.

Tested on
1. Debian, Ubuntu.
2. Redhat, CentOS.
3. OpenSUSE.

Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
2009-03-03 11:44:21 +05:30
Harshavardhana
b2db5d966f Added /etc/init.d/glusterfsd for rpmbuilds
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
2009-02-28 00:06:22 +05:30
Vikas Gorur
77adf4cd64 Added all files 2009-02-18 17:36:07 +05:30