summaryrefslogtreecommitdiffstats
path: root/glusterfs.spec.in
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-01-12 17:35:34 +0100
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-01-14 03:34:40 -0800
commit8dcc5596c5370fcbee6ac8fc89cc90ff1d5fd29a (patch)
treeda294cb4d7f47a0866c2c03ec6ef6aaa2be5f78c /glusterfs.spec.in
parenta7b399fd0ef928c2cca4092b00edb21e70c59f62 (diff)
scripts: prevent running 'showmount' from the start/post hook script
The 31ganesha-start.sh hook script tries to run 'showmount' to see if the volume that is getting started should get exported by NFS-Ganesha. It was reported that this caused the 'gluster volume start ...' command to hang in case rpcbind is not running. Instead of running 'showmount', we can use DBus to contact NFS-Ganesha directly, and request the available exports. This will immediately fail in case NFS-Ganesha is not running. Cherry picked from commit 2b2294d2a4ef221fccb6eb9f74e9b7dc233b9f1d: > BUG: 1294446 > Change-Id: I3aba1f86fead67116ca5adb1864a8be626c334fa > Reported-by: Jeff Darcy <jdarcy@redhat.com> > Signed-off-by: Niels de Vos <ndevos@redhat.com> > Reviewed-on: http://review.gluster.org/13098 > Tested-by: Raghavendra Talur <rtalur@redhat.com> > Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> > Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> BUG: 1297862 Change-Id: I3aba1f86fead67116ca5adb1864a8be626c334fa Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/13230 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
-rw-r--r--glusterfs.spec.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index a74bf7f6fed..69195784185 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -374,7 +374,7 @@ Group: Applications/File
Requires: %{name}-server = %{version}-%{release}
Requires: nfs-ganesha-gluster
-Requires: pcs
+Requires: pcs, /usr/bin/dbus-send
%description ganesha
GlusterFS is a distributed file-system capable of scaling to several
@@ -1268,6 +1268,9 @@ fi
%changelog
+* Mon Dec 28 2015 Niels de Vos <ndevos@redhat.com>
+- hook scripts in glusterfs-ganesha use dbus-send, add dependency (#1294446)
+
* Tue Sep 15 2015 Anand Nekkunti <anekkunt@redhat.com>
- adding glusterfs-firewalld service (#1057295)